From 4883e8aae2384092e06b590ba975285f35ddc8d1 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Sun, 2 Dec 2012 19:36:43 +0100
Subject: [PATCH] Prepare for separate solutions for MSVC2010 and MSVC2012.

---
 src/global.h                                  |  3 ++
 src/version.h                                 |  2 +-
 ...launcher.sln => x264_launcher_MSVC2010.sln |  2 +-
 ....vcxproj => x264_launcher_MSVC2010.vcxproj | 34 ++++++++++++++++---
 ... => x264_launcher_MSVC2010.vcxproj.filters |  0
 5 files changed, 34 insertions(+), 7 deletions(-)
 rename x264_launcher.sln => x264_launcher_MSVC2010.sln (90%)
 rename x264_launcher.vcxproj => x264_launcher_MSVC2010.vcxproj (93%)
 rename x264_launcher.vcxproj.filters => x264_launcher_MSVC2010.vcxproj.filters (100%)

diff --git a/src/global.h b/src/global.h
index d42e77c..1fdcfa9 100644
--- a/src/global.h
+++ b/src/global.h
@@ -70,6 +70,9 @@
 #define X264_BOOL(X) ((X) ? "1" : "0")
 #define X264_DELETE(PTR) if(PTR) { delete PTR; PTR = NULL; }
 #define X264_DELETE_ARRAY(PTR) if(PTR) { delete [] PTR; PTR = NULL; }
+#define _X264_MAKE_STRING_(X) #X
+#define X264_MAKE_STRING(X) _X264_MAKE_STRING_(X)
+#define X264_COMPILER_WARNING(TXT) __pragma(message(__FILE__ "(" X264_MAKE_STRING(__LINE__) ") : warning: " TXT))
 
 //Declarations
 class QString;
diff --git a/src/version.h b/src/version.h
index 9a5cedf..2238eba 100644
--- a/src/version.h
+++ b/src/version.h
@@ -22,7 +22,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 0
 #define VER_X264_PATCH 7
-#define VER_X264_BUILD 388
+#define VER_X264_BUILD 395
 
 #define VER_X264_MINIMUM_REV 2223
 #define VER_X264_CURRENT_API 129
diff --git a/x264_launcher.sln b/x264_launcher_MSVC2010.sln
similarity index 90%
rename from x264_launcher.sln
rename to x264_launcher_MSVC2010.sln
index 5ebdfec..e4cebe5 100644
--- a/x264_launcher.sln
+++ b/x264_launcher_MSVC2010.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x264_launcher", "x264_launcher.vcxproj", "{563D953B-CBC3-4C75-AFC2-5BD87531C332}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x264_launcher", "x264_launcher_MSVC2010.vcxproj", "{563D953B-CBC3-4C75-AFC2-5BD87531C332}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/x264_launcher.vcxproj b/x264_launcher_MSVC2010.vcxproj
similarity index 93%
rename from x264_launcher.vcxproj
rename to x264_launcher_MSVC2010.vcxproj
index 0e139ca..3aaeb76 100644
--- a/x264_launcher.vcxproj
+++ b/x264_launcher_MSVC2010.vcxproj
@@ -14,6 +14,7 @@
     <ProjectGuid>{563D953B-CBC3-4C75-AFC2-5BD87531C332}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>x264_launcher</RootNamespace>
+    <ProjectName>x264_launcher</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -39,7 +40,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -64,9 +64,21 @@
       <AdditionalDependencies>QtMaind.lib;QtCored4.lib;QtGuid4.lib;Winmm.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>rmdir /S /Q "$(SolutionDir)bin\$(Configuration)\toolset"
-mkdir "$(SolutionDir)bin\$(Configuration)\toolset"
-copy /Y "$(SolutionDir)res\toolset\*.exe" "$(TargetDir)\toolset"
+      <Command>del /S /Q "$(TargetDir)\*.dll"
+rmdir /S /Q "$(TargetDir)\toolset"
+rmdir /S /Q "$(TargetDir)\imageformats"
+mkdir "$(TargetDir)\toolset"
+mkdir "$(TargetDir)\imageformats"
+copy /Y "$(SolutionDir)res\toolset\*.exe" "$(TargetDir)\toolset\"
+copy /Y "$(QTDIR)\bin\QtCored4.dll" "$(TargetDir)"
+copy /Y "$(QTDIR)\bin\QtGuid4.dll" "$(TargetDir)"
+copy /Y "$(QTDIR)\bin\QtSvgd4.dll" "$(TargetDir)"
+copy /Y "$(QTDIR)\bin\QtXmld4.dll" "$(TargetDir)"
+copy /Y "$(QTDIR)\plugins\imageformats\qicod4.dll" "$(TargetDir)\imageformats"
+copy /Y "$(QTDIR)\plugins\imageformats\qsvgd4.dll" "$(TargetDir)\imageformats"
+copy /Y "$(QTDIR)\plugins\imageformats\qjpegd4.dll" "$(TargetDir)\imageformats"
+copy /Y "$(QTDIR)\plugins\imageformats\qtiffd4.dll" "$(TargetDir)\imageformats"
+copy /Y "$(QTDIR)\plugins\imageformats\qgifd4.dll" "$(TargetDir)\imageformats"
 copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.dll" "$(TargetDir)"
 copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.manifest" "$(TargetDir)"
 </Command>
@@ -122,9 +134,21 @@ copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.manifest" "$(TargetDir)"
       </Message>
     </PreLinkEvent>
     <PostBuildEvent>
-      <Command>rmdir /S /Q "$(TargetDir)\toolset"
+      <Command>del /S /Q "$(TargetDir)\*.dll"
+rmdir /S /Q "$(TargetDir)\toolset"
+rmdir /S /Q "$(TargetDir)\imageformats"
 mkdir "$(TargetDir)\toolset"
+mkdir "$(TargetDir)\imageformats"
 copy /Y "$(SolutionDir)res\toolset\*.exe" "$(TargetDir)\toolset\"
+copy /Y "$(QTDIR)\bin\QtCore4.dll" "$(TargetDir)"
+copy /Y "$(QTDIR)\bin\QtGui4.dll" "$(TargetDir)"
+copy /Y "$(QTDIR)\bin\QtSvg4.dll" "$(TargetDir)"
+copy /Y "$(QTDIR)\bin\QtXml4.dll" "$(TargetDir)"
+copy /Y "$(QTDIR)\plugins\imageformats\qico4.dll" "$(TargetDir)\imageformats"
+copy /Y "$(QTDIR)\plugins\imageformats\qsvg4.dll" "$(TargetDir)\imageformats"
+copy /Y "$(QTDIR)\plugins\imageformats\qjpeg4.dll" "$(TargetDir)\imageformats"
+copy /Y "$(QTDIR)\plugins\imageformats\qtiff4.dll" "$(TargetDir)\imageformats"
+copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats"
 </Command>
       <Message>Copy Toolset</Message>
     </PostBuildEvent>
diff --git a/x264_launcher.vcxproj.filters b/x264_launcher_MSVC2010.vcxproj.filters
similarity index 100%
rename from x264_launcher.vcxproj.filters
rename to x264_launcher_MSVC2010.vcxproj.filters