diff --git a/build/win32/vs10/cogl-install.props b/build/win32/vs10/cogl-install.props index 96a4b56a0..b843f4ebf 100644 --- a/build/win32/vs10/cogl-install.props +++ b/build/win32/vs10/cogl-install.props @@ -4,6 +4,10 @@ + $(SolutionDir)$(Configuration)\$(Platform)\bin + $(BinDir)\$(CoglDllPrefix)cogl(CoglDllSuffix).dll;$(BinDir)\$(CoglDllPrefix)cogl-path(CoglDllSuffix).dll;$(BinDir)\$(CoglDllPrefix)cogl-pango(CoglDllSuffix).dll + $(BinDir)\cogl-crate.exe;$(BinDir)\cogl-hello.exe;$(BinDir)\cogl-info.exe + $(BinDir)\cogl-sdl2-hello.exe mkdir $(CopyDir)\bin @@ -15,11 +19,11 @@ if "$(Configuration)" == "Release_SDL" goto DO_REL_BIN if "$(Configuration)" == "Debug_SDL" goto DO_DBG_BIN -copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin +copy $(BinDir)\*.dll $(CopyDir)\bin -copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib +copy $(BinDir)\*-$(ApiVersion).lib $(CopyDir)\lib -copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin +copy $(BinDir)\*.exe $(CopyDir)\bin goto DONE_BIN @@ -212,6 +216,18 @@ copy ..\..\..\cogl-path\cogl-path-enum-types.h $(CopyDir)\include\cogl-$(ApiVers <_PropertySheetDisplayName>coglinstallprops + + $(BinDir) + + + $(InstalledDlls) + + + $(InstalledBins) + + + $(InstalledSDLBins) + $(CoglDoInstall) diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index b1115ff6a..a1fbd15e8 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -134,57 +134,49 @@ - - $(CoglDoInstall) - - - -$(CoglDoInstall) -$(CoglDoInstallSDL) - - - - $(CoglDoInstall) - - - -$(CoglDoInstall) -$(CoglDoInstallSDL) - - - - $(CoglDoInstall) - - - -$(CoglDoInstall) -$(CoglDoInstallSDL) - - - - $(CoglDoInstall) - - - -$(CoglDoInstall) -$(CoglDoInstallSDL) - - + + + Installing Build Results... + $(CoglDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + Installing Build Results... + $(CoglDoInstall)$(CoglDoInstallSDL) + $(InstalledDlls);$(InstalledBins);$(InstalledSDLBins);%(Outputs) + Installing Build Results... + $(CoglDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + Installing Build Results... + $(CoglDoInstall)$(CoglDoInstallSDL) + $(InstalledDlls);$(InstalledBins);$(InstalledSDLBins);%(Outputs) + Installing Build Results... + $(CoglDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + Installing Build Results... + $(CoglDoInstall)$(CoglDoInstallSDL) + $(InstalledDlls);$(InstalledBins);$(InstalledSDLBins);%(Outputs) + Installing Build Results... + $(CoglDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + Installing Build Results... + $(CoglDoInstall)$(CoglDoInstallSDL) + $(InstalledDlls);$(InstalledBins);$(InstalledSDLBins);%(Outputs) + + {0f08f253-de1a-40cb-a890-93ae3ca23ade}