Menu
▾
▴
[vba-commit] VisualBoyAdvance/win32 vba_vs2005.suo, 1.9, 1.10 vba_vs2005.vcproj, 1.5, 1.6
|
From: Spacy <sp...@us...> - 2006-06-29 11:33:34
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8032/win32 Modified Files: vba_vs2005.suo vba_vs2005.vcproj Log Message: Fixed mistake in SDL compile target (was linking with MFC because display.cpp was not disabled) Index: vba_vs2005.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** vba_vs2005.vcproj 24 Jun 2006 20:21:47 -0000 1.5 --- vba_vs2005.vcproj 29 Jun 2006 11:33:31 -0000 1.6 *************** *** 1,3 **** ! <?xml version="1.0" encoding="UTF-8"?> <VisualStudioProject ProjectType="Visual C++" --- 1,3 ---- ! <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" *************** *** 245,254 **** <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" --- 245,254 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="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="" GenerateDebugInformation="true" SubSystem="1" *************** *** 279,283 **** <Tool Name="VCPostBuildEventTool" - Description="" CommandLine="" ExcludedFromBuild="true" --- 279,282 ---- *************** *** 334,343 **** <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" --- 333,342 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="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="" GenerateDebugInformation="true" SubSystem="1" *************** *** 370,374 **** <Tool Name="VCPostBuildEventTool" - Description="" CommandLine="" ExcludedFromBuild="true" --- 369,372 ---- *************** *** 3551,3554 **** --- 3549,3568 ---- RelativePath="..\src\win32\display.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 Index: vba_vs2005.suo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 Binary files /tmp/cvsd1RhX7 and /tmp/cvsUFItgb differ |