diff --git a/win32/docs/how2compile.txt b/win32/docs/how2compile.txt index 8988a581..b6785026 100644 --- a/win32/docs/how2compile.txt +++ b/win32/docs/how2compile.txt @@ -9,10 +9,6 @@ NOTE: Unicode support requires a special zlib build - see the end of the zlib en - A recent DirectX SDK. The official binary is compiled against the June 2008 SDK. -- nasm(optional). I use version 0.97. Used to assemble the optional ZSNES FX and C4 core - included in Snes9x. Download from www.web-sites.co.uk/nasm - Note: the official binary does not use the asm files. - - zlib(optional) - The release binaries are built against a static zlib compiled against VC's multi-threaded C runtime and renamed to zlibmt.lib, to avoid linker conflicts. removing ZLIB from the preprocessor definitions and zlibmt.lib from the library @@ -42,8 +38,6 @@ NOTE: Unicode support requires a special zlib build - see the end of the zlib en Definitions text box. - To compile Snes9x: - Run the MAKEASM.BAT script. nasmw will need to be on your path - for the script to work. Only necessary if you want to compile with ZSNES_C4 or ZSNES_FX Start up Visual C++. Load the Snes9x project file. Select the desired configuration and build. diff --git a/win32/makeasm.bat b/win32/makeasm.bat deleted file mode 100644 index 35246cba..00000000 --- a/win32/makeasm.bat +++ /dev/null @@ -1,8 +0,0 @@ -nasmw -dZSNES_FX -dZSNES_C4 -f win32 -i . -i ../i386/ -o ../i386/fxemu2.obj ../i386/fxemu2.asm -nasmw -dZSNES_FX -dZSNES_C4 -f win32 -i . -i ../i386/ -o ../i386/fxemu2b.obj ../i386/fxemu2b.asm -nasmw -dZSNES_FX -dZSNES_C4 -f win32 -i . -i ../i386/ -o ../i386/fxemu2c.obj ../i386/fxemu2c.asm -nasmw -dZSNES_FX -dZSNES_C4 -f win32 -i . -i ../i386/ -o ../i386/fxtable.obj ../i386/fxtable.asm -nasmw -dZSNES_FX -dZSNES_C4 -f win32 -i . -i ../i386/ -o ../i386/sfxproc.obj ../i386/sfxproc.asm -nasmw -dZSNES_FX -dZSNES_C4 -f win32 -i . -i ../i386/ -o ../i386/zsnes.obj ../i386/zsnes.asm -nasmw -dZSNES_FX -dZSNES_C4 -f win32 -i . -i ../i386/ -o ../i386/c4.obj ../i386/c4.asm -nasmw -dZSNES_FX -dZSNES_C4 -f win32 -i . -i ../i386/ -o ../i386/zsnesc4.obj ../i386/zsnesc4.asm diff --git a/win32/snes9xw.sln b/win32/snes9xw.sln index 9b6115f6..051975ff 100644 --- a/win32/snes9xw.sln +++ b/win32/snes9xw.sln @@ -9,14 +9,10 @@ Global Debug Unicode|x64 = Debug Unicode|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Debug+ASM|Win32 = Debug+ASM|Win32 - Debug+ASM|x64 = Debug+ASM|x64 Release Unicode|Win32 = Release Unicode|Win32 Release Unicode|x64 = Release Unicode|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - Release+ASM|Win32 = Release+ASM|Win32 - Release+ASM|x64 = Release+ASM|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32 @@ -27,10 +23,6 @@ Global {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Debug|Win32.Build.0 = Debug|Win32 {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Debug|x64.ActiveCfg = Debug|x64 {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Debug|x64.Build.0 = Debug|x64 - {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Debug+ASM|Win32.ActiveCfg = Debug+ASM|Win32 - {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Debug+ASM|Win32.Build.0 = Debug+ASM|Win32 - {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Debug+ASM|x64.ActiveCfg = Debug+ASM|x64 - {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Debug+ASM|x64.Build.0 = Debug+ASM|x64 {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32 {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release Unicode|Win32.Build.0 = Release Unicode|Win32 {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 @@ -39,10 +31,6 @@ Global {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release|Win32.Build.0 = Release|Win32 {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release|x64.ActiveCfg = Release|x64 {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release|x64.Build.0 = Release|x64 - {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release+ASM|Win32.ActiveCfg = Release+ASM|Win32 - {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release+ASM|Win32.Build.0 = Release+ASM|Win32 - {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release+ASM|x64.ActiveCfg = Release+ASM|x64 - {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release+ASM|x64.Build.0 = Release+ASM|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win32/snes9xw.vcproj b/win32/snes9xw.vcproj index 8d595516..adad32fa 100644 --- a/win32/snes9xw.vcproj +++ b/win32/snes9xw.vcproj @@ -57,7 +57,7 @@ OmitFramePointers="true" WholeProgramOptimization="true" AdditionalIncludeDirectories="$(ProjectDir),$(ProjectDir)..\,$(ProjectDir)..\..\,$(ProjectDir)..\..\zLib,$(ProjectDir)..\unzip,$(ProjectDir)..\..\FMOD\api\inc,$(ProjectDir)..\..\libPNG\src,$(ProjectDir)..\snes9x" - PreprocessorDefinitions="NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;CORRECT_VRAM_READS;CPU_SHUTDOWN;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT" + PreprocessorDefinitions="NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;CORRECT_VRAM_READS;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT" StringPooling="true" RuntimeLibrary="0" StructMemberAlignment="0" @@ -159,7 +159,7 @@ OmitFramePointers="true" WholeProgramOptimization="true" AdditionalIncludeDirectories="$(ProjectDir),$(ProjectDir)..\,$(ProjectDir)..\..\,$(ProjectDir)..\..\zLib,$(ProjectDir)..\unzip,$(ProjectDir)..\..\FMOD\api\inc,$(ProjectDir)..\..\libPNG\src,$(ProjectDir)..\snes9x" - PreprocessorDefinitions="NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;CORRECT_VRAM_READS;CPU_SHUTDOWN;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT" + PreprocessorDefinitions="NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;CORRECT_VRAM_READS;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT" StringPooling="true" RuntimeLibrary="0" StructMemberAlignment="0" @@ -256,7 +256,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(ProjectDir),$(ProjectDir)..\,$(ProjectDir)..\..\,$(ProjectDir)..\..\zLib,$(ProjectDir)..\unzip,$(ProjectDir)..\..\FMOD\api\inc,$(ProjectDir)..\..\libPNG\src,$(ProjectDir)..\snes9x" - PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;SPC700_C;JMA_SUPPORT;SDD1_DECOMP;CORRECT_VRAM_READS;SPC700_SHUTDOWN;CPU_SHUTDOWN;ZLIB;VAR_CYCLES;UNZIP_SUPPORT;EXECUTE_SUPERFX_PER_LINE;__WIN32__;__MSC__;NEW_COLOUR_BLENDING;USE_OPENGL;NETPLAY_SUPPORT;USE_DIRECTX3D;FMODEX_SUPPORT" + PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;CORRECT_VRAM_READS;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;FMODEX_SUPPORT;D3D_DEBUG_INFO" RuntimeLibrary="1" StructMemberAlignment="0" UsePrecompiledHeader="0" @@ -355,7 +355,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(ProjectDir),$(ProjectDir)..\,$(ProjectDir)..\..\,$(ProjectDir)..\..\zLib,$(ProjectDir)..\unzip,$(ProjectDir)..\..\FMOD\api\inc,$(ProjectDir)..\..\libPNG\src,$(ProjectDir)..\snes9x" - PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;CORRECT_VRAM_READS;CPU_SHUTDOWN;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;FMODEX_SUPPORT;D3D_DEBUG_INFO" + PreprocessorDefinitions="_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;CORRECT_VRAM_READS;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;FMODEX_SUPPORT;D3D_DEBUG_INFO" RuntimeLibrary="1" StructMemberAlignment="0" UsePrecompiledHeader="0" @@ -420,396 +420,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1295,20 +891,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -1345,20 +927,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -1377,38 +945,6 @@ - - - - - - - - - - - - - - - - - - @@ -1489,20 +1011,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -1539,20 +1047,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -1589,20 +1083,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -1639,20 +1119,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -1685,20 +1151,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -1735,20 +1187,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -1785,20 +1223,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -1849,34 +1273,6 @@ Name="VCCustomBuildTool" /> - - - - - - - - - - - - @@ -1923,20 +1319,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -1973,20 +1355,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2023,20 +1391,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2085,20 +1439,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2149,38 +1489,6 @@ Name="VCCLCompilerTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2317,38 +1561,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -2431,20 +1611,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2481,20 +1647,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2529,22 +1681,6 @@ CompileAs="0" /> - - - - - - @@ -2583,20 +1719,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2637,20 +1759,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2687,20 +1795,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2733,20 +1827,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2779,20 +1859,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2829,20 +1895,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2879,20 +1931,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2929,20 +1967,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -2975,20 +1999,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3021,20 +2031,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3071,20 +2067,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3121,20 +2103,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3171,20 +2139,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3221,20 +2175,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3271,20 +2211,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3321,20 +2247,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3371,20 +2283,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3425,20 +2323,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3487,20 +2371,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3537,20 +2407,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3587,20 +2443,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -3651,38 +2493,6 @@ Name="VCCLCompilerTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4101,38 +2801,6 @@ Name="VCCLCompilerTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4468,20 +3090,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -4556,34 +3164,6 @@ Name="VCCustomBuildTool" /> - - - - - - - - - - - - @@ -4673,38 +3253,6 @@ Name="VCCustomBuildTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6437,20 +4551,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -6483,20 +4583,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -6529,20 +4615,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -6575,20 +4647,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -6621,20 +4679,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -6667,20 +4711,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -6717,20 +4747,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -6771,20 +4787,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -6821,20 +4823,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -6871,20 +4859,6 @@ Name="VCCustomBuildTool" /> - - - - - - @@ -7016,38 +4990,6 @@ Name="VCCustomBuildTool" /> - - - - - - - - - - - -