Permalink
Browse files

re-added skin support

switched optimizations back to SSE1
  • Loading branch information...
1 parent 9748304 commit 482ec9005e16d0597a7c7aed1dfc964cfad65866 spacy51 committed Aug 23, 2006
View
@@ -8,11 +8,7 @@
/* memgzio.c - IO on .gz files in memory
* Adapted from original gzio.c from zlib library by Forgotten
*/
-#ifndef HAVE_ZUTIL_H
-#include "../win32/include/zlib/zutil.h"
-#else
#include <zutil.h>
-#endif
gzFile ZEXPORT memgzopen(char *memory, int, const char *);
int ZEXPORT memgzread(gzFile, voidp, unsigned);
@@ -17,9 +17,10 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -44,6 +45,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
+ EnableEnhancedInstructionSet="1"
DisableLanguageExtensions="true"
UsePrecompiledHeader="0"
WarningLevel="1"
@@ -83,9 +85,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -17,9 +17,10 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -43,6 +44,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
+ EnableEnhancedInstructionSet="1"
DisableLanguageExtensions="true"
UsePrecompiledHeader="0"
WarningLevel="1"
@@ -81,9 +83,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
View
@@ -4,6 +4,7 @@ Microsoft Visual Studio Solution File, Format Version 9.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vba_vs2005", "vba_vs2005.vcproj", "{EAD25A86-E6DB-4258-8875-197930F28F6A}"
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
EndProject
@@ -27,6 +28,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "dependencies\libp
{B938FBD9-C7F9-4BF7-8C27-68865D1FA092} = {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "dependencies\cximage\cximage.vcproj", "{DB5C12E9-BCD3-4517-8708-475C0D1D88CE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
MFC_Debug|Win32 = MFC_Debug|Win32
@@ -59,13 +62,22 @@ Global
{96E945F7-0377-48DA-A5F8-1C192DE9F25F}.SDL_Debug|Win32.Build.0 = Debug|Win32
{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
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{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
AMDCaProjectFile =
View
Binary file not shown.
View
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="MFC_Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="1"
@@ -42,11 +42,12 @@
<Tool
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"
+ 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"
Detect64BitPortabilityProblems="false"
@@ -69,7 +70,7 @@
AdditionalDependencies="nafxcwd.lib LIBCMTD.lib WSock32.Lib Vfw32.Lib dinput.lib winmm.lib d3d9.lib d3dx9d.lib DxErr.lib OpenGL32.Lib"
OutputFile="$(OutDir)\VisualBoyAdvance_debug.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories=".\dependencies\zlib\Release;.\dependencies\libpng\Release;.\dependencies\sdl\Release"
+ AdditionalLibraryDirectories=""
GenerateManifest="false"
IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib"
GenerateDebugInformation="true"
@@ -105,11 +106,11 @@
</Configuration>
<Configuration
Name="MFC_Release|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="1"
- WholeProgramOptimization="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -134,8 +135,8 @@
InlineFunctionExpansion="2"
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"
+ 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"
EnableEnhancedInstructionSet="1"
@@ -162,14 +163,14 @@
AdditionalDependencies="nafxcw.lib LIBCMT.lib WSock32.Lib Vfw32.Lib dinput.lib winmm.lib d3d9.lib d3dx9.lib DxErr.lib OpenGL32.Lib"
OutputFile="$(OutDir)\VisualBoyAdvance.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=".\dependencies\zlib\Release;.\dependencies\libpng\Release;.\dependencies\sdl\Release"
+ AdditionalLibraryDirectories=""
GenerateManifest="false"
IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="4"
+ LinkTimeCodeGeneration="1"
TargetMachine="1"
/>
<Tool
@@ -201,7 +202,7 @@
</Configuration>
<Configuration
Name="SDL_Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="0"
@@ -231,6 +232,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
+ EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
@@ -250,10 +252,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib.lib libpng.lib WSock32.Lib SDLmain.lib SDL.lib dxguid.lib winmm.lib"
+ AdditionalDependencies="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"
+ AdditionalLibraryDirectories=""
GenerateManifest="false"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -290,11 +292,11 @@
</Configuration>
<Configuration
Name="SDL_Release|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="0"
- WholeProgramOptimization="0"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -339,10 +341,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib.lib libpng.lib WSock32.Lib SDLmain.lib SDL.lib dxguid.lib winmm.lib"
+ AdditionalDependencies="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"
+ AdditionalLibraryDirectories=""
GenerateManifest="false"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -1192,6 +1194,10 @@
/>
</FileConfiguration>
</File>
+ <File
+ RelativePath="..\src\win32\skinButton.h"
+ >
+ </File>
<File
RelativePath="..\src\win32\ZoomControl.h"
>
@@ -2212,6 +2218,10 @@
/>
</FileConfiguration>
</File>
+ <File
+ RelativePath="..\src\win32\skin.h"
+ >
+ </File>
<File
RelativePath="..\src\win32\StringTokenizer.h"
>
@@ -2744,6 +2754,10 @@
/>
</FileConfiguration>
</File>
+ <File
+ RelativePath="..\src\win32\skinButton.cpp"
+ >
+ </File>
<File
RelativePath="..\src\win32\ZoomControl.cpp"
>
@@ -3948,6 +3962,10 @@
/>
</FileConfiguration>
</File>
+ <File
+ RelativePath="..\src\win32\skin.cpp"
+ >
+ </File>
<File
RelativePath="..\src\win32\StringTokenizer.cpp"
>

0 comments on commit 482ec90

Please sign in to comment.