[cogl/cogl-1.18] Visual C++ 2008 Builds: Fix Installation of Binaries



commit 0b96d15315d38a979d9f897b92b49bdee7afaa12
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Mar 4 15:28:52 2014 +0800

    Visual C++ 2008 Builds: Fix Installation of Binaries
    
    The *.dll, *.exe and *.lib files weren't being copied in the *_SDL configs
    as the project looked for them in the wrong place.  Correct that problem.

 build/win32/vs9/cogl-install.vsprops |   36 ++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/build/win32/vs9/cogl-install.vsprops b/build/win32/vs9/cogl-install.vsprops
index ef0d01e..292eb9b 100644
--- a/build/win32/vs9/cogl-install.vsprops
+++ b/build/win32/vs9/cogl-install.vsprops
@@ -6,22 +6,42 @@
        InheritedPropertySheets=".\cogl-build-defines.vsprops"
        >
        <UserMacro
-               Name="CoglDoInstall"
+               Name="CoglDoInstallBin"
                Value="
-mkdir $(CopyDir)&#x0D;&#x0A;
 mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
+mkdir $(CopyDir)\lib&#x0D;&#x0A;
+
+if &quot;$(ConfigurationName)&quot; == &quot;Release_SDL&quot; goto DO_REL_BIN&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_SDL&quot; goto DO_DBG_BIN&#x0D;&#x0A;
 
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
+goto DONE_BIN&#x0D;&#x0A;
 
-copy ..\*.bat $(CopyDir)\bin&#x0D;&#x0A;
+:DO_REL_BIN&#x0D;&#x0A;
+copy Release\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
+copy Release\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy Release\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
+goto DONE_BIN&#x0D;&#x0A;
+
+:DO_DBG_BIN&#x0D;&#x0A;
+copy Debug\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
+copy Debug\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy Debug\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
+goto DONE_BIN&#x0D;&#x0A;
+
+:DONE_BIN&#x0D;&#x0A;
+                     "
+       />
+       <UserMacro
+               Name="CoglDoInstall"
+               Value="
+$(CoglDoInstallBin)&#x0D;&#x0A;
 
 mkdir $(CopyDir)\share\cogl-$(ApiVersion)\examples-data&#x0D;&#x0A;
 copy ..\..\..\examples\crate.jpg $(CopyDir)\share\cogl-$(ApiVersion)\examples-data&#x0D;&#x0A;
 
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
 mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl\deprecated&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-atlas-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl&#x0D;&#x0A;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]