Menu
▾
▴
[vba-commit] VisualBoyAdvance/win32 .cvsignore, 1.4, 1.5 vba_vs2005.suo, 1.8, 1.9 vba_vs2005.vcproj, 1.4, 1.5
|
From: Spacy <sp...@us...> - 2006-06-24 20:21:50
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv337/win32 Modified Files: .cvsignore vba_vs2005.suo vba_vs2005.vcproj Log Message: Added the rewrites of Labmaster's VBA-H features. Included SDL binaries for easier compialtion. Index: .cvsignore =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .cvsignore 27 May 2006 14:56:06 -0000 1.4 --- .cvsignore 24 Jun 2006 20:21:47 -0000 1.5 *************** *** 8,10 **** MFC_Debug vba_vs2005.vcproj.A1.Spacy.user ! SDL_Release \ No newline at end of file --- 8,11 ---- MFC_Debug vba_vs2005.vcproj.A1.Spacy.user ! SDL_Release ! SDL_Debug \ No newline at end of file Index: vba_vs2005.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** vba_vs2005.vcproj 12 Jun 2006 22:03:25 -0000 1.4 --- vba_vs2005.vcproj 24 Jun 2006 20:21:47 -0000 1.5 *************** *** 22,28 **** --- 22,30 ---- ConfigurationType="1" UseOfMFC="1" + WholeProgramOptimization="0" > <Tool Name="VCPreBuildEventTool" + ExcludedFromBuild="true" /> <Tool *************** *** 41,45 **** Name="VCCLCompilerTool" 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" --- 43,47 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=".\dependencies\zlib;.\dependencies\libpng;.\dependencies\sdl" PreprocessorDefinitions="WIN32;WINVER=0x0500;_DEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;DEV_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;NOSKINS" MinimalRebuild="true" *************** *** 61,64 **** --- 63,67 ---- <Tool Name="VCPreLinkEventTool" + ExcludedFromBuild="true" /> <Tool *************** *** 67,71 **** OutputFile="$(OutDir)\VisualBoyAdvance_debug.exe" LinkIncremental="2" ! AdditionalLibraryDirectories=".\dependencies\zlib\Debug;.\dependencies\libpng\Debug;.\dependencies\libjasper\Debug;.\dependencies\libjpeg\Debug;.\dependencies\libtiff\Debug;.\dependencies\cximage\Debug" GenerateManifest="false" IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib" --- 70,74 ---- OutputFile="$(OutDir)\VisualBoyAdvance_debug.exe" LinkIncremental="2" ! AdditionalLibraryDirectories=".\dependencies\zlib\Release;.\dependencies\libpng\Release;.\dependencies\sdl\Release" GenerateManifest="false" IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib" *************** *** 98,101 **** --- 101,105 ---- <Tool Name="VCPostBuildEventTool" + ExcludedFromBuild="true" /> </Configuration> *************** *** 106,113 **** ConfigurationType="1" UseOfMFC="1" ! WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" /> <Tool --- 110,118 ---- ConfigurationType="1" UseOfMFC="1" ! WholeProgramOptimization="0" > <Tool Name="VCPreBuildEventTool" + ExcludedFromBuild="true" /> <Tool *************** *** 127,131 **** InlineFunctionExpansion="1" 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" --- 132,136 ---- InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories=".\dependencies\zlib;.\dependencies\libpng;.\dependencies\sdl" PreprocessorDefinitions="WIN32;WINVER=0x0500;NDEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;NOSKINS" RuntimeLibrary="0" *************** *** 146,149 **** --- 151,155 ---- <Tool Name="VCPreLinkEventTool" + ExcludedFromBuild="true" /> <Tool *************** *** 152,156 **** OutputFile="$(OutDir)\VisualBoyAdvance.exe" LinkIncremental="1" ! AdditionalLibraryDirectories=".\dependencies\zlib\Release;.\dependencies\libpng\Release;.\dependencies\libjasper\Release;.\dependencies\libjpeg\Release;.\dependencies\libtiff\Release;.\dependencies\cximage\Release" GenerateManifest="false" IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib" --- 158,162 ---- OutputFile="$(OutDir)\VisualBoyAdvance.exe" LinkIncremental="1" ! AdditionalLibraryDirectories=".\dependencies\zlib\Release;.\dependencies\libpng\Release;.\dependencies\sdl\Release" GenerateManifest="false" IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib" *************** *** 185,188 **** --- 191,195 ---- <Tool Name="VCPostBuildEventTool" + ExcludedFromBuild="true" /> </Configuration> *************** *** 193,199 **** --- 200,208 ---- ConfigurationType="1" UseOfMFC="0" + WholeProgramOptimization="0" > <Tool Name="VCPreBuildEventTool" + ExcludedFromBuild="true" /> <Tool *************** *** 232,244 **** <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" ! AdditionalDependencies="zlib.lib libpng.lib WSock32.Lib SDLmain.lib SDL.lib" OutputFile="$(OutDir)\VisualBoyAdvance_SDL_debug.exe" LinkIncremental="2" ! AdditionalLibraryDirectories=".\dependencies\zlib\Debug;.\dependencies\libpng\Debug;.\dependencies\sdl\Debug" GenerateManifest="false" ! IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" SubSystem="1" --- 241,254 ---- <Tool Name="VCPreLinkEventTool" + ExcludedFromBuild="true" /> <Tool Name="VCLinkerTool" ! AdditionalDependencies="nafxcwd.lib LIBCMTD.lib zlib.lib libpng.lib WSock32.Lib SDLmain.lib SDL.lib dxguid.lib winmm.lib" OutputFile="$(OutDir)\VisualBoyAdvance_SDL_debug.exe" LinkIncremental="2" ! AdditionalLibraryDirectories=".\dependencies\zlib\Release;.\dependencies\libpng\Release;.\dependencies\sdl\Release" GenerateManifest="false" ! IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib;libcmt.lib" GenerateDebugInformation="true" SubSystem="1" *************** *** 269,274 **** <Tool Name="VCPostBuildEventTool" ! Description="Copying SDL.dll..." ! CommandLine="del "$(OutDir)\SDL.dll"
copy ".\dependencies\sdl\Debug\SDL.dll" "$(OutDir)\SDL.dll"
" /> </Configuration> --- 279,285 ---- <Tool Name="VCPostBuildEventTool" ! Description="" ! CommandLine="" ! ExcludedFromBuild="true" /> </Configuration> *************** *** 279,286 **** ConfigurationType="1" UseOfMFC="0" ! WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" /> <Tool --- 290,298 ---- ConfigurationType="1" UseOfMFC="0" ! WholeProgramOptimization="0" > <Tool Name="VCPreBuildEventTool" + ExcludedFromBuild="true" /> <Tool *************** *** 318,330 **** <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" ! AdditionalDependencies="zlib.lib libpng.lib WSock32.Lib SDLmain.lib SDL.lib" OutputFile="$(OutDir)\VisualBoyAdvance_SDL.exe" LinkIncremental="1" AdditionalLibraryDirectories=".\dependencies\zlib\Release;.\dependencies\libpng\Release;.\dependencies\sdl\Release" GenerateManifest="false" ! IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" SubSystem="1" --- 330,343 ---- <Tool Name="VCPreLinkEventTool" + ExcludedFromBuild="true" /> <Tool Name="VCLinkerTool" ! AdditionalDependencies="nafxcw.lib LIBCMT.lib zlib.lib libpng.lib WSock32.Lib SDLmain.lib SDL.lib dxguid.lib winmm.lib" OutputFile="$(OutDir)\VisualBoyAdvance_SDL.exe" LinkIncremental="1" AdditionalLibraryDirectories=".\dependencies\zlib\Release;.\dependencies\libpng\Release;.\dependencies\sdl\Release" GenerateManifest="false" ! IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib" GenerateDebugInformation="true" SubSystem="1" *************** *** 357,362 **** <Tool Name="VCPostBuildEventTool" ! Description="Copying SDL.dll..." ! CommandLine="del "$(OutDir)\SDL.dll"
copy ".\dependencies\sdl\Release\SDL.dll" "$(OutDir)\SDL.dll"
" /> </Configuration> --- 370,376 ---- <Tool Name="VCPostBuildEventTool" ! Description="" ! CommandLine="" ! ExcludedFromBuild="true" /> </Configuration> Index: vba_vs2005.suo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 Binary files /tmp/cvs44rK8u and /tmp/cvsD9bhzR differ |
