From: Spacy <sp...@us...> - 2006-06-08 03:44:18
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7573/win32 Modified Files: vba_vs2005.sln vba_vs2005.vcproj Log Message: skin support was bloating dependencies Index: vba_vs2005.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vba_vs2005.vcproj 26 May 2006 14:37:41 -0000 1.2 --- vba_vs2005.vcproj 7 Jun 2006 16:46:28 -0000 1.3 *************** *** 42,46 **** Optimization="0" AdditionalIncludeDirectories=".\dependencies\zlib;.\dependencies\libpng;.\dependencies\cximage" ! PreprocessorDefinitions="WIN32;WINVER=0x0500;_DEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;DEV_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" --- 42,46 ---- Optimization="0" AdditionalIncludeDirectories=".\dependencies\zlib;.\dependencies\libpng;.\dependencies\cximage" ! PreprocessorDefinitions="WIN32;WINVER=0x0500;_DEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;DEV_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;NOSKINS" MinimalRebuild="true" BasicRuntimeChecks="3" *************** *** 128,132 **** FavorSizeOrSpeed="1" AdditionalIncludeDirectories=".\dependencies\zlib;.\dependencies\libpng;.\dependencies\cximage" ! PreprocessorDefinitions="WIN32;WINVER=0x0500;NDEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="0" UsePrecompiledHeader="0" --- 128,132 ---- FavorSizeOrSpeed="1" AdditionalIncludeDirectories=".\dependencies\zlib;.\dependencies\libpng;.\dependencies\cximage" ! PreprocessorDefinitions="WIN32;WINVER=0x0500;NDEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;NOSKINS" RuntimeLibrary="0" UsePrecompiledHeader="0" *************** *** 1174,1197 **** </File> <File - RelativePath="..\src\win32\skinButton.h" - > - <FileConfiguration - Name="SDL_Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="SDL_Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File RelativePath="..\src\win32\ZoomControl.h" > --- 1174,1177 ---- *************** *** 2214,2237 **** </File> <File - RelativePath="..\src\win32\skin.h" - > - <FileConfiguration - Name="SDL_Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="SDL_Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File RelativePath="..\src\win32\StringTokenizer.h" > --- 2194,2197 ---- *************** *** 2543,2547 **** Name="VCCustomBuildTool" Description="Assembling $(InputFileName)..." ! CommandLine="yasm -D __DJGPP__ --oformat=win32 --arch=x86 --dformat=cv8 --machine=x86 -X vc --objfile="$(OutDir)\$(InputName).obj" "$(InputPath)"
" Outputs=""$(OutDir)\$(InputName).obj"" /> --- 2503,2507 ---- Name="VCCustomBuildTool" Description="Assembling $(InputFileName)..." ! CommandLine="yasm-0.5.0rc2-win32.exe -D __DJGPP__ --oformat=win32 --arch=x86 --dformat=cv8 --machine=x86 -X vc --objfile="$(OutDir)\$(InputName).obj" "$(InputPath)"" Outputs=""$(OutDir)\$(InputName).obj"" /> *************** *** 2553,2557 **** Name="VCCustomBuildTool" Description="Assembling $(InputFileName)..." ! CommandLine="yasm -D __DJGPP__ --oformat=win32 --arch=x86 --dformat=cv8 --machine=x86 -X vc --objfile="$(OutDir)\$(InputName).obj" "$(InputPath)"
" Outputs=""$(OutDir)\$(InputName).obj"" /> --- 2513,2517 ---- Name="VCCustomBuildTool" Description="Assembling $(InputFileName)..." ! CommandLine="yasm-0.5.0rc2-win32.exe -D __DJGPP__ --oformat=win32 --arch=x86 --dformat=cv8 --machine=x86 -X vc --objfile="$(OutDir)\$(InputName).obj" "$(InputPath)"" Outputs=""$(OutDir)\$(InputName).obj"" /> *************** *** 2563,2567 **** Name="VCCustomBuildTool" Description="Assembling $(InputFileName)..." ! CommandLine="yasm -D __DJGPP__ --oformat=win32 --arch=x86 --dformat=cv8 --machine=x86 -X vc --objfile="$(OutDir)\$(InputName).obj" "$(InputPath)"
" Outputs=""$(OutDir)\$(InputName).obj"" /> --- 2523,2527 ---- Name="VCCustomBuildTool" Description="Assembling $(InputFileName)..." ! CommandLine="yasm-0.5.0rc2-win32.exe -D __DJGPP__ --oformat=win32 --arch=x86 --dformat=cv8 --machine=x86 -X vc --objfile="$(OutDir)\$(InputName).obj" "$(InputPath)"" Outputs=""$(OutDir)\$(InputName).obj"" /> *************** *** 2573,2577 **** Name="VCCustomBuildTool" Description="Assembling $(InputFileName)..." ! CommandLine="yasm -D __DJGPP__ --oformat=win32 --arch=x86 --dformat=cv8 --machine=x86 -X vc --objfile="$(OutDir)\$(InputName).obj" "$(InputPath)"
" Outputs=""$(OutDir)\$(InputName).obj"" /> --- 2533,2537 ---- Name="VCCustomBuildTool" Description="Assembling $(InputFileName)..." ! CommandLine="yasm-0.5.0rc2-win32.exe -D __DJGPP__ --oformat=win32 --arch=x86 --dformat=cv8 --machine=x86 -X vc --objfile="$(OutDir)\$(InputName).obj" "$(InputPath)"" Outputs=""$(OutDir)\$(InputName).obj"" /> *************** *** 2766,2789 **** </File> <File - RelativePath="..\src\win32\skinButton.cpp" - > - <FileConfiguration - Name="SDL_Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="SDL_Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File RelativePath="..\src\win32\ZoomControl.cpp" > --- 2726,2729 ---- *************** *** 3594,3597 **** --- 3534,3541 ---- </File> <File + RelativePath="..\src\win32\display.cpp" + > + </File> + <File RelativePath="..\src\win32\GDIDisplay.cpp" > *************** *** 3970,3993 **** </File> <File - RelativePath="..\src\win32\skin.cpp" - > - <FileConfiguration - Name="SDL_Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="SDL_Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File RelativePath="..\src\win32\StringTokenizer.cpp" > --- 3914,3917 ---- Index: vba_vs2005.sln =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.sln,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** vba_vs2005.sln 13 May 2006 16:25:15 -0000 1.1 --- vba_vs2005.sln 7 Jun 2006 16:46:28 -0000 1.2 *************** *** 4,8 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vba_vs2005", "vba_vs2005.vcproj", "{EAD25A86-E6DB-4258-8875-197930F28F6A}" ProjectSection(ProjectDependencies) = postProject - {473DF9B7-67D5-48F0-B949-B17C33569ABE} = {473DF9B7-67D5-48F0-B949-B17C33569ABE} {B938FBD9-C7F9-4BF7-8C27-68865D1FA092} = {B938FBD9-C7F9-4BF7-8C27-68865D1FA092} {96E945F7-0377-48DA-A5F8-1C192DE9F25F} = {96E945F7-0377-48DA-A5F8-1C192DE9F25F} --- 4,7 ---- *************** *** 29,50 **** EndProjectSection EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "dependencies\cximage\cximage.vcproj", "{473DF9B7-67D5-48F0-B949-B17C33569ABE}" - ProjectSection(ProjectDependencies) = postProject - {85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5} = {85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5} - {B938FBD9-C7F9-4BF7-8C27-68865D1FA092} = {B938FBD9-C7F9-4BF7-8C27-68865D1FA092} - {BF3270E3-1256-4101-AB40-A64F93A694DF} = {BF3270E3-1256-4101-AB40-A64F93A694DF} - {C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB} = {C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB} - {96E945F7-0377-48DA-A5F8-1C192DE9F25F} = {96E945F7-0377-48DA-A5F8-1C192DE9F25F} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjasper", "dependencies\libjasper\libjasper.vcproj", "{85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5}" - ProjectSection(ProjectDependencies) = postProject - {BF3270E3-1256-4101-AB40-A64F93A694DF} = {BF3270E3-1256-4101-AB40-A64F93A694DF} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "dependencies\libjpeg\libjpeg.vcproj", "{BF3270E3-1256-4101-AB40-A64F93A694DF}" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "dependencies\libtiff\libtiff.vcproj", "{C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB}" - EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution --- 28,31 ---- *************** *** 79,114 **** {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.SDL_Release|Win32.ActiveCfg = Release|Win32 {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.SDL_Release|Win32.Build.0 = Release|Win32 - {473DF9B7-67D5-48F0-B949-B17C33569ABE}.MFC_Debug|Win32.ActiveCfg = Debug|Win32 - {473DF9B7-67D5-48F0-B949-B17C33569ABE}.MFC_Debug|Win32.Build.0 = Debug|Win32 - {473DF9B7-67D5-48F0-B949-B17C33569ABE}.MFC_Release|Win32.ActiveCfg = Release|Win32 - {473DF9B7-67D5-48F0-B949-B17C33569ABE}.MFC_Release|Win32.Build.0 = Release|Win32 - {473DF9B7-67D5-48F0-B949-B17C33569ABE}.SDL_Debug|Win32.ActiveCfg = Debug|Win32 - {473DF9B7-67D5-48F0-B949-B17C33569ABE}.SDL_Debug|Win32.Build.0 = Debug|Win32 - {473DF9B7-67D5-48F0-B949-B17C33569ABE}.SDL_Release|Win32.ActiveCfg = Release|Win32 - {473DF9B7-67D5-48F0-B949-B17C33569ABE}.SDL_Release|Win32.Build.0 = Release|Win32 - {85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5}.MFC_Debug|Win32.ActiveCfg = Debug|Win32 - {85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5}.MFC_Debug|Win32.Build.0 = Debug|Win32 - {85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5}.MFC_Release|Win32.ActiveCfg = Release|Win32 - {85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5}.MFC_Release|Win32.Build.0 = Release|Win32 - {85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5}.SDL_Debug|Win32.ActiveCfg = Debug|Win32 - {85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5}.SDL_Debug|Win32.Build.0 = Debug|Win32 - {85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5}.SDL_Release|Win32.ActiveCfg = Release|Win32 - {85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5}.SDL_Release|Win32.Build.0 = Release|Win32 - {BF3270E3-1256-4101-AB40-A64F93A694DF}.MFC_Debug|Win32.ActiveCfg = Debug|Win32 - {BF3270E3-1256-4101-AB40-A64F93A694DF}.MFC_Debug|Win32.Build.0 = Debug|Win32 - {BF3270E3-1256-4101-AB40-A64F93A694DF}.MFC_Release|Win32.ActiveCfg = Release|Win32 - {BF3270E3-1256-4101-AB40-A64F93A694DF}.MFC_Release|Win32.Build.0 = Release|Win32 - {BF3270E3-1256-4101-AB40-A64F93A694DF}.SDL_Debug|Win32.ActiveCfg = Debug|Win32 - {BF3270E3-1256-4101-AB40-A64F93A694DF}.SDL_Debug|Win32.Build.0 = Debug|Win32 - {BF3270E3-1256-4101-AB40-A64F93A694DF}.SDL_Release|Win32.ActiveCfg = Release|Win32 - {BF3270E3-1256-4101-AB40-A64F93A694DF}.SDL_Release|Win32.Build.0 = Release|Win32 - {C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB}.MFC_Debug|Win32.ActiveCfg = Debug|Win32 - {C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB}.MFC_Debug|Win32.Build.0 = Debug|Win32 - {C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB}.MFC_Release|Win32.ActiveCfg = Release|Win32 - {C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB}.MFC_Release|Win32.Build.0 = Release|Win32 - {C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB}.SDL_Debug|Win32.ActiveCfg = Debug|Win32 - {C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB}.SDL_Debug|Win32.Build.0 = Debug|Win32 - {C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB}.SDL_Release|Win32.ActiveCfg = Release|Win32 - {C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB}.SDL_Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution --- 60,63 ---- *************** *** 118,125 **** {B938FBD9-C7F9-4BF7-8C27-68865D1FA092} = {F78600CD-B229-4EE2-9351-A9D5D47AEA3B} {96E945F7-0377-48DA-A5F8-1C192DE9F25F} = {F78600CD-B229-4EE2-9351-A9D5D47AEA3B} - {473DF9B7-67D5-48F0-B949-B17C33569ABE} = {F78600CD-B229-4EE2-9351-A9D5D47AEA3B} - {85E8D00B-0D33-49EE-820C-D8BF4C9CE2E5} = {F78600CD-B229-4EE2-9351-A9D5D47AEA3B} - {BF3270E3-1256-4101-AB40-A64F93A694DF} = {F78600CD-B229-4EE2-9351-A9D5D47AEA3B} - {C0D925F7-58BA-44D2-9DD6-4CBAB2A65BFB} = {F78600CD-B229-4EE2-9351-A9D5D47AEA3B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution --- 67,70 ---- |