Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Prepare for separate solutions for MSVC2010 and MSVC2012.

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-12-02 19:36:43 +01:00
parent ea0f4b813e
commit 4883e8aae2
5 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/global.h
View File

@ -70,6 +70,9 @@
#define X264_BOOL(X) ((X) ? "1" : "0") #define X264_BOOL(X) ((X) ? "1" : "0")
#define X264_DELETE(PTR) if(PTR) { delete PTR; PTR = NULL; } #define X264_DELETE(PTR) if(PTR) { delete PTR; PTR = NULL; }
#define X264_DELETE_ARRAY(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 //Declarations
class QString; class QString;

2
src/version.h
View File

@ -22,7 +22,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 0 #define VER_X264_MINOR 0
#define VER_X264_PATCH 7 #define VER_X264_PATCH 7
#define VER_X264_BUILD 388 #define VER_X264_BUILD 395
#define VER_X264_MINIMUM_REV 2223 #define VER_X264_MINIMUM_REV 2223
#define VER_X264_CURRENT_API 129 #define VER_X264_CURRENT_API 129

2
x264_launcher.sln → x264_launcher_MSVC2010.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010 # 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

34
x264_launcher.vcxproj → x264_launcher_MSVC2010.vcxproj
View File

@ -14,6 +14,7 @@
<ProjectGuid>{563D953B-CBC3-4C75-AFC2-5BD87531C332}</ProjectGuid> <ProjectGuid>{563D953B-CBC3-4C75-AFC2-5BD87531C332}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>x264_launcher</RootNamespace> <RootNamespace>x264_launcher</RootNamespace>
<ProjectName>x264_launcher</ProjectName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -39,7 +40,6 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\</IntDir> <IntDir>$(SolutionDir)obj\$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
@ -64,9 +64,21 @@
<AdditionalDependencies>QtMaind.lib;QtCored4.lib;QtGuid4.lib;Winmm.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>QtMaind.lib;QtCored4.lib;QtGuid4.lib;Winmm.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>rmdir /S /Q "$(SolutionDir)bin\$(Configuration)\toolset" <Command>del /S /Q "$(TargetDir)\*.dll"
mkdir "$(SolutionDir)bin\$(Configuration)\toolset" rmdir /S /Q "$(TargetDir)\toolset"
copy /Y "$(SolutionDir)res\toolset\*.exe" "$(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\*.dll" "$(TargetDir)"
copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.manifest" "$(TargetDir)" copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.manifest" "$(TargetDir)"
</Command> </Command>
@ -122,9 +134,21 @@ copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.manifest" "$(TargetDir)"
</Message> </Message>
</PreLinkEvent> </PreLinkEvent>
<PostBuildEvent> <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)\toolset"
mkdir "$(TargetDir)\imageformats"
copy /Y "$(SolutionDir)res\toolset\*.exe" "$(TargetDir)\toolset\" 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> </Command>
<Message>Copy Toolset</Message> <Message>Copy Toolset</Message>
</PostBuildEvent> </PostBuildEvent>

0
x264_launcher.vcxproj.filters → x264_launcher_MSVC2010.vcxproj.filters
View File