adjustments for newer build tools version

coapp-packages · Jun 3, 2013 · 42112b3 · 42112b3
1 parent 0bcde83
commit 42112b3
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 20 deletions.
diff --git a/copkg/.buildinfo b/copkg/.buildinfo
@@ -18,7 +18,6 @@ default {
 
     .Copy {
         SourceFiles : {
-            $(MSBuildThisFileDirectory)vcxproj.inc,
             $(MSBuildThisFileDirectory)..\jconfig.vc,
             $(MSBuildThisFileDirectory)..\makejsln.v11,
             $(MSBuildThisFileDirectory)..\makeasln.v11,
@@ -30,7 +29,6 @@ default {
             $(MSBuildThisFileDirectory)..\makervcx.v11,
         };
         DestinationFiles : {
-            $(MSBuildThisFileDirectory)..\msvc\vcxproj.inc,
             $(MSBuildThisFileDirectory)..\msvc\jconfig.h,
             $(MSBuildThisFileDirectory)..\msvc\makejsln.sln,
             $(MSBuildThisFileDirectory)..\msvc\makeasln.sln,
@@ -43,7 +41,7 @@ default {
         };
     };
 
-	("v110, v100", "Win32, x64", "Debug,Release", "Dynamic, Static", "cdecl") => {
+	("v110, v100", "Win32, x64", "Debug,Release", "Dynamic, Static, ltcg", "cdecl") => {
 		.PushEnvironment {};
 		.LoadSystemEnvironment {};
         .SetEnvironmentFromTarget.Target = "VC_${0}_${1}";

diff --git a/copkg/libjpeg.autopkg b/copkg/libjpeg.autopkg
@@ -21,22 +21,27 @@ Homepage: http://www.ijg.org/";
 
 	files {
 		include: {
-			..\jconfig.h,
-			..\jpeglib.h,
-			..\jmorecfg.h,
-			..\jerror.h,
+			..\msvc\jconfig.h,
+			..\msvc\jpeglib.h,
+			..\msvc\jmorecfg.h,
+			..\msvc\jerror.h,
 			};
 
 		source += {
 			..\*.c,
 			..\*.h,
 		};
 
-		("release,debug", "Win32,x64", "v100,v110") => {
-			[${0},${1},${2}] {
-				lib:     { libjpeg\${0}\${1}\${2}\libjpeg.lib };
-				bin:     { libjpeg\${0}\${1}\${2}\libjpeg.dll };
-				symbols: { libjpeg\${0}\${1}\${2}\libjpeg.pdb };
+		("v100,v110", "Win32,x64", "release,debug", "Dynamic", "cdecl") => {
+			[${0},${1},${2},${3},${4}] {
+				lib:     { ..\msvc\output\${0}\${1}\${2}\${3}\${4}\lib\jpeg.lib };
+				bin:     { ..\msvc\output\${0}\${1}\${2}\${3}\${4}\lib\jpeg.dll };
+				symbols: { ..\msvc\output\${0}\${1}\${2}\${3}\${4}\lib\jpeg.pdb };
+			};
+		};
+		("v100,v110", "Win32,x64", "release,debug", "Static,ltcg", "cdecl") => {
+			[${0},${1},${2},${3},${4}] {
+				lib:     { ..\msvc\output\${0}\${1}\${2}\${3}\${4}\lib\jpeg.lib };
 			};
 		};
 	};

diff --git a/copkg/version.inc b/copkg/version.inc
@@ -1 +1 @@
-#define { package-version: 8.0.4.14; } 
+#define { package-version: 9.0.1.1; } 
diff --git a/makecvcx.v11 b/makecvcx.v11
@@ -45,7 +45,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(MSBuildThisFileDirectory)vcxproj.inc" Condition="exists('$(MSBuildThisFileDirectory)vcxproj.inc')"/>
+  <Import Project="$(CoAppEtcDirectory)vcxproj.inc" Condition="Exists('$(CoAppEtcDirectory)vcxproj.inc')" />
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

diff --git a/makedvcx.v11 b/makedvcx.v11
@@ -45,7 +45,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(MSBuildThisFileDirectory)vcxproj.inc" Condition="exists('$(MSBuildThisFileDirectory)vcxproj.inc')"/>
+  <Import Project="$(CoAppEtcDirectory)vcxproj.inc" Condition="Exists('$(CoAppEtcDirectory)vcxproj.inc')" />
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

diff --git a/makejvcx.v11 b/makejvcx.v11
@@ -107,7 +107,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(MSBuildThisFileDirectory)vcxproj.inc" Condition="exists('$(MSBuildThisFileDirectory)vcxproj.inc')"/>
+  <Import Project="$(CoAppEtcDirectory)vcxproj.inc" Condition="Exists('$(CoAppEtcDirectory)vcxproj.inc')" />
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

diff --git a/makelvcx.v11 b/makelvcx.v11
@@ -99,7 +99,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDirectory)vcxproj.inc" Condition="exists('$(MSBuildThisFileDirectory)vcxproj.inc')"/>
+  <Import Project="$(CoAppEtcDirectory)vcxproj.inc" Condition="Exists('$(CoAppEtcDirectory)vcxproj.inc')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>

diff --git a/makervcx.v11 b/makervcx.v11
@@ -45,7 +45,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(MSBuildThisFileDirectory)vcxproj.inc" Condition="exists('$(MSBuildThisFileDirectory)vcxproj.inc')"/>
+  <Import Project="$(CoAppEtcDirectory)vcxproj.inc" Condition="Exists('$(CoAppEtcDirectory)vcxproj.inc')" />
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

diff --git a/maketvcx.v11 b/maketvcx.v11
@@ -45,7 +45,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(MSBuildThisFileDirectory)vcxproj.inc" Condition="exists('$(MSBuildThisFileDirectory)vcxproj.inc')"/>
+  <Import Project="$(CoAppEtcDirectory)vcxproj.inc" Condition="Exists('$(CoAppEtcDirectory)vcxproj.inc')" />
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

diff --git a/makewvcx.v11 b/makewvcx.v11
@@ -56,7 +56,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(MSBuildThisFileDirectory)vcxproj.inc" Condition="exists('$(MSBuildThisFileDirectory)vcxproj.inc')"/>
+  <Import Project="$(CoAppEtcDirectory)vcxproj.inc" Condition="Exists('$(CoAppEtcDirectory)vcxproj.inc')" />
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
     <ClCompile>
       <Optimization>Full</Optimization>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define { package-version: 8.0.4.14; }
		#define { package-version: 9.0.1.1; }