vba-commit

[Spacy <sp...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/win32
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11388/win32

Modified Files:
	vba_vs2005.sln vba_vs2005.suo vba_vs2005.vcproj 
Log Message:
re-added skin support
switched optimizations back to SSE1

Index: vba_vs2005.vcproj
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.vcproj,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** vba_vs2005.vcproj	18 Aug 2006 13:48:51 -0000	1.13
--- vba_vs2005.vcproj	23 Aug 2006 22:13:30 -0000	1.14
***************
*** 18,22 ****
  		<Configuration
  			Name="MFC_Debug|Win32"
! 			OutputDirectory="$(ConfigurationName)"
  			IntermediateDirectory="$(ConfigurationName)"
  			ConfigurationType="1"
--- 18,22 ----
  		<Configuration
  			Name="MFC_Debug|Win32"
! 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
  			IntermediateDirectory="$(ConfigurationName)"
  			ConfigurationType="1"
***************
*** 43,51 ****
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories=".\dependencies\zlib;.\dependencies\libpng"
! 				PreprocessorDefinitions="WIN32;WINVER=0x0500;_DEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;DEV_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;NOSKINS"
  				MinimalRebuild="true"
  				BasicRuntimeChecks="3"
  				RuntimeLibrary="1"
  				UsePrecompiledHeader="0"
  				WarningLevel="3"
--- 43,52 ----
  				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"
  				MinimalRebuild="true"
  				BasicRuntimeChecks="3"
  				RuntimeLibrary="1"
+ 				EnableEnhancedInstructionSet="1"
  				UsePrecompiledHeader="0"
  				WarningLevel="3"
***************
*** 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"
--- 71,75 ----
  				OutputFile="$(OutDir)\VisualBoyAdvance_debug.exe"
  				LinkIncremental="2"
! 				AdditionalLibraryDirectories=""
  				GenerateManifest="false"
  				IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib"
***************
*** 106,114 ****
  		<Configuration
  			Name="MFC_Release|Win32"
! 			OutputDirectory="$(ConfigurationName)"
  			IntermediateDirectory="$(ConfigurationName)"
  			ConfigurationType="1"
  			UseOfMFC="1"
! 			WholeProgramOptimization="2"
  			>
  			<Tool
--- 107,115 ----
  		<Configuration
  			Name="MFC_Release|Win32"
! 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
  			IntermediateDirectory="$(ConfigurationName)"
  			ConfigurationType="1"
  			UseOfMFC="1"
! 			WholeProgramOptimization="1"
  			>
  			<Tool
***************
*** 135,140 ****
  				FavorSizeOrSpeed="1"
  				WholeProgramOptimization="true"
! 				AdditionalIncludeDirectories=".\dependencies\zlib;.\dependencies\libpng"
! 				PreprocessorDefinitions="WIN32;WINVER=0x0500;NDEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;NOSKINS"
  				RuntimeLibrary="0"
  				BufferSecurityCheck="false"
--- 136,141 ----
  				FavorSizeOrSpeed="1"
  				WholeProgramOptimization="true"
! 				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"
  				BufferSecurityCheck="false"
***************
*** 163,167 ****
  				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
  				LinkIncremental="1"
! 				AdditionalLibraryDirectories=".\dependencies\zlib\Release;.\dependencies\libpng\Release;.\dependencies\sdl\Release"
  				GenerateManifest="false"
  				IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
--- 164,168 ----
  				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
  				LinkIncremental="1"
! 				AdditionalLibraryDirectories=""
  				GenerateManifest="false"
  				IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
***************
*** 170,174 ****
  				OptimizeReferences="2"
  				EnableCOMDATFolding="2"
! 				LinkTimeCodeGeneration="4"
  				TargetMachine="1"
  			/>
--- 171,175 ----
  				OptimizeReferences="2"
  				EnableCOMDATFolding="2"
! 				LinkTimeCodeGeneration="1"
  				TargetMachine="1"
  			/>
***************
*** 202,206 ****
  		<Configuration
  			Name="SDL_Debug|Win32"
! 			OutputDirectory="$(ConfigurationName)"
  			IntermediateDirectory="$(ConfigurationName)"
  			ConfigurationType="1"
--- 203,207 ----
  		<Configuration
  			Name="SDL_Debug|Win32"
! 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
  			IntermediateDirectory="$(ConfigurationName)"
  			ConfigurationType="1"
***************
*** 232,235 ****
--- 233,237 ----
  				BasicRuntimeChecks="3"
  				RuntimeLibrary="1"
+ 				EnableEnhancedInstructionSet="1"
  				UsePrecompiledHeader="0"
  				WarningLevel="3"
***************
*** 251,258 ****
  			<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=""
--- 253,260 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="WSock32.Lib SDLmain.lib SDL.lib dxguid.lib winmm.lib"
  				OutputFile="$(OutDir)\VisualBoyAdvance_SDL_debug.exe"
  				LinkIncremental="2"
! 				AdditionalLibraryDirectories=""
  				GenerateManifest="false"
  				IgnoreDefaultLibraryNames=""
***************
*** 291,299 ****
  		<Configuration
  			Name="SDL_Release|Win32"
! 			OutputDirectory="$(ConfigurationName)"
  			IntermediateDirectory="$(ConfigurationName)"
  			ConfigurationType="1"
  			UseOfMFC="0"
! 			WholeProgramOptimization="0"
  			>
  			<Tool
--- 293,301 ----
  		<Configuration
  			Name="SDL_Release|Win32"
! 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
  			IntermediateDirectory="$(ConfigurationName)"
  			ConfigurationType="1"
  			UseOfMFC="0"
! 			WholeProgramOptimization="1"
  			>
  			<Tool
***************
*** 340,347 ****
  			<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=""
--- 342,349 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="WSock32.Lib SDLmain.lib SDL.lib dxguid.lib winmm.lib"
  				OutputFile="$(OutDir)\VisualBoyAdvance_SDL.exe"
  				LinkIncremental="1"
! 				AdditionalLibraryDirectories=""
  				GenerateManifest="false"
  				IgnoreDefaultLibraryNames=""
***************
*** 1194,1197 ****
--- 1196,1203 ----
  					</File>
  					<File
+ 						RelativePath="..\src\win32\skinButton.h"
+ 						>
+ 					</File>
+ 					<File
  						RelativePath="..\src\win32\ZoomControl.h"
  						>
***************
*** 2214,2217 ****
--- 2220,2227 ----
  					</File>
  					<File
+ 						RelativePath="..\src\win32\skin.h"
+ 						>
+ 					</File>
+ 					<File
  						RelativePath="..\src\win32\StringTokenizer.h"
  						>
***************
*** 2746,2749 ****
--- 2756,2763 ----
  					</File>
  					<File
+ 						RelativePath="..\src\win32\skinButton.cpp"
+ 						>
+ 					</File>
+ 					<File
  						RelativePath="..\src\win32\ZoomControl.cpp"
  						>
***************
*** 3950,3953 ****
--- 3964,3971 ----
  					</File>
  					<File
+ 						RelativePath="..\src\win32\skin.cpp"
+ 						>
+ 					</File>
+ 					<File
  						RelativePath="..\src\win32\StringTokenizer.cpp"
  						>

Index: vba_vs2005.suo
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
Binary files /tmp/cvsxsH6u1 and /tmp/cvsZcphbg differ

Index: vba_vs2005.sln
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.sln,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vba_vs2005.sln	7 Jun 2006 16:46:28 -0000	1.2
--- vba_vs2005.sln	23 Aug 2006 22:13:30 -0000	1.3
***************
*** 5,8 ****
--- 5,9 ----
  	ProjectSection(ProjectDependencies) = postProject
  		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092} = {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}
+ 		{DB5C12E9-BCD3-4517-8708-475C0D1D88CE} = {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}
  		{96E945F7-0377-48DA-A5F8-1C192DE9F25F} = {96E945F7-0377-48DA-A5F8-1C192DE9F25F}
  	EndProjectSection
***************
*** 28,31 ****
--- 29,34 ----
  	EndProjectSection
  EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "dependencies\cximage\cximage.vcproj", "{DB5C12E9-BCD3-4517-8708-475C0D1D88CE}"
+ EndProject
  Global
  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
***************
*** 60,63 ****
--- 63,74 ----
  		{96E945F7-0377-48DA-A5F8-1C192DE9F25F}.SDL_Release|Win32.ActiveCfg = Release|Win32
  		{96E945F7-0377-48DA-A5F8-1C192DE9F25F}.SDL_Release|Win32.Build.0 = Release|Win32
+ 		{DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.MFC_Debug|Win32.ActiveCfg = Debug|Win32
+ 		{DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.MFC_Debug|Win32.Build.0 = Debug|Win32
+ 		{DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.MFC_Release|Win32.ActiveCfg = Release|Win32
+ 		{DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.MFC_Release|Win32.Build.0 = Release|Win32
+ 		{DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.SDL_Debug|Win32.ActiveCfg = Debug|Win32
+ 		{DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.SDL_Debug|Win32.Build.0 = Debug|Win32
+ 		{DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.SDL_Release|Win32.ActiveCfg = Release|Win32
+ 		{DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.SDL_Release|Win32.Build.0 = Release|Win32
  	EndGlobalSection
  	GlobalSection(SolutionProperties) = preSolution
***************
*** 67,70 ****
--- 78,82 ----
  		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092} = {F78600CD-B229-4EE2-9351-A9D5D47AEA3B}
  		{96E945F7-0377-48DA-A5F8-1C192DE9F25F} = {F78600CD-B229-4EE2-9351-A9D5D47AEA3B}
+ 		{DB5C12E9-BCD3-4517-8708-475C0D1D88CE} = {F78600CD-B229-4EE2-9351-A9D5D47AEA3B}
  	EndGlobalSection
  	GlobalSection(ExtensibilityGlobals) = postSolution