From e62c63a771b9744c8329644a9c6d072be1cfe7aa Mon Sep 17 00:00:00 2001 From: zeromus Date: Thu, 28 Jul 2016 20:09:40 +0000 Subject: [PATCH] add "public release" build configuration --- trunk/vc/.gitignore | 1 + trunk/vc/vc10_fceux.sln | 6 + trunk/vc/vc10_fceux.vcxproj | 234 ++++++++++++++++++++++++++++++++++++ 3 files changed, 241 insertions(+) diff --git a/trunk/vc/.gitignore b/trunk/vc/.gitignore index 497fb848..ea4c7f12 100644 --- a/trunk/vc/.gitignore +++ b/trunk/vc/.gitignore @@ -22,3 +22,4 @@ /vc8_obj_Release /.vs /SRV +/vc10_obj_PublicRelease diff --git a/trunk/vc/vc10_fceux.sln b/trunk/vc/vc10_fceux.sln index 4b61e3c2..9cf6f0f1 100644 --- a/trunk/vc/vc10_fceux.sln +++ b/trunk/vc/vc10_fceux.sln @@ -7,6 +7,8 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + PublicRelease|Win32 = PublicRelease|Win32 + PublicRelease|x64 = PublicRelease|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection @@ -14,6 +16,10 @@ Global {6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|Win32.ActiveCfg = Debug|Win32 {6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|Win32.Build.0 = Debug|Win32 {6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|x64.ActiveCfg = Debug|Win32 + {6893EF44-FEA3-46DF-B236-C4C200F54294}.PublicRelease|Win32.ActiveCfg = PublicRelease|Win32 + {6893EF44-FEA3-46DF-B236-C4C200F54294}.PublicRelease|Win32.Build.0 = PublicRelease|Win32 + {6893EF44-FEA3-46DF-B236-C4C200F54294}.PublicRelease|x64.ActiveCfg = PublicRelease|x64 + {6893EF44-FEA3-46DF-B236-C4C200F54294}.PublicRelease|x64.Build.0 = PublicRelease|x64 {6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|Win32.ActiveCfg = Release|Win32 {6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|Win32.Build.0 = Release|Win32 {6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|x64.ActiveCfg = Release|Win32 diff --git a/trunk/vc/vc10_fceux.vcxproj b/trunk/vc/vc10_fceux.vcxproj index fa5d97ae..6f3fb4f8 100644 --- a/trunk/vc/vc10_fceux.vcxproj +++ b/trunk/vc/vc10_fceux.vcxproj @@ -9,6 +9,14 @@ Debug x64 + + PublicRelease + Win32 + + + PublicRelease + x64 + Release Win32 @@ -30,6 +38,11 @@ NotSet true + + Application + NotSet + true + Application NotSet @@ -39,6 +52,11 @@ NotSet true + + Application + NotSet + true + Application NotSet @@ -49,12 +67,18 @@ + + + + + + @@ -64,14 +88,20 @@ vc10_bin_$(Configuration)\ vc10_obj_$(Configuration)\ ..\output\ + ..\output\ vc10_obj_$(Configuration)\ + vc10_obj_$(Configuration)\ false + false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false + false AllRules.ruleset @@ -79,11 +109,17 @@ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + true @@ -167,6 +203,50 @@ xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z.dll" "$(OutDir)" + + + + + + SubWCRev.bat + write current revision number to placeholders + + + Full + AnySuitable + true + Speed + true + .;../src/drivers/win/zlib;../src/drivers/win/directx;../src;../src/drivers/win/lua/include;userconfig;defaultconfig;%(AdditionalIncludeDirectories) + PUBLIC_RELEASE;WIN32;NDEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST;_USE_32BIT_TIME_T;FCEUDEF_DEBUGGER;_USE_SHARED_MEMORY_;NOMINMAX;HAS_vsnprintf;_S9XLUA_H;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + Default + /MP %(AdditionalOptions) + true + + + Rpcrt4.lib;comctl32.lib;vfw32.lib;winmm.lib;ws2_32.lib;htmlhelp.lib;../src/drivers/win/directx/dsound.lib;../src/drivers/win/directx/dxguid.lib;../src/drivers/win/directx/ddraw.lib;../src/drivers/win/directx/dinput.lib;../src/drivers/win/lua/win32/lua51.lib;luaperks.lib;psapi.lib;mpr.lib;%(AdditionalDependencies) + lua51.dll;%(DelayLoadDLLs) + true + Windows + true + true + mainCRTStartup + false + + + MachineX86 + /pdbaltpath:%_PDB% %(AdditionalOptions) + + + $(ProjectDir)../src/drivers/win/fceu_x86.manifest;%(AdditionalManifestFiles) + + + xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z.dll" "$(OutDir)" @@ -227,6 +307,35 @@ lua51.dll + + + X64 + + + Full + AnySuitable + true + Speed + true + ../zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + dxguid.lib;winmm.lib;dinput.lib;ws2_32.lib;ddraw.lib;dsound.lib;../src/drivers/win/lua/x64/lua51.lib;%(AdditionalDependencies) + true + Windows + true + true + mainCRTStartup + MachineX64 + lua51.dll + + false @@ -355,6 +464,7 @@ true + true @@ -476,63 +586,78 @@ CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC 4789 + 4789 @@ -563,182 +688,242 @@ true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true @@ -911,140 +1096,186 @@ true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true @@ -1109,8 +1340,11 @@ xcopy /y /d "$(ProjectDir)\..\src\auxlib.lua" "$(OutDir)" xcopy /y /d "$(ProjectDir)\..\src\auxlib.lua" "$(OutDir)" + + xcopy /y /d "$(ProjectDir)\..\src\auxlib.lua" "$(OutDir)" $(OutDir)auxlib.lua;%(Outputs) + $(OutDir)auxlib.lua;%(Outputs) true