diff --git a/win32/CD3DCG.cpp b/win32/CD3DCG.cpp index 95b61b5f..d5458cb6 100644 --- a/win32/CD3DCG.cpp +++ b/win32/CD3DCG.cpp @@ -383,7 +383,7 @@ bool CD3DCG::LoadShader(const TCHAR *shaderFile) hr = pDevice->CreateVertexBuffer(sizeof(VERTEX)*4,D3DUSAGE_WRITEONLY,0,D3DPOOL_MANAGED,&pass.vertexBuffer,NULL); if(FAILED(hr)) { pass.vertexBuffer = NULL; - DXTRACE_ERR_MSGBOX(L"Error creating vertex buffer", hr); + DXTRACE_ERR_MSGBOX(TEXT("Error creating vertex buffer"), hr); return false; } @@ -449,7 +449,7 @@ void CD3DCG::ensureTextureSize(LPDIRECT3DTEXTURE9 &tex, D3DXVECTOR2 &texSize, texSize = wantedSize; if(FAILED(hr)) { - DXTRACE_ERR_MSGBOX(L"Error while creating texture", hr); + DXTRACE_ERR_MSGBOX(TEXT("Error while creating texture"), hr); return; } } @@ -860,7 +860,7 @@ void CD3DCG::setupVertexDeclaration(shaderPass &pass) LPDIRECT3DVERTEXDECLARATION9 vertexDeclaration; HRESULT hr = pDevice->CreateVertexDeclaration(vElems,&vertexDeclaration); if(FAILED(hr)) { - DXTRACE_ERR_MSGBOX(L"Error creating vertex declaration", hr); + DXTRACE_ERR_MSGBOX(TEXT("Error creating vertex declaration"), hr); } if(pass.vertexDeclaration) pass.vertexDeclaration->Release(); diff --git a/win32/CDirect3D.cpp b/win32/CDirect3D.cpp index 7fd8d6eb..3338d27a 100644 --- a/win32/CDirect3D.cpp +++ b/win32/CDirect3D.cpp @@ -272,7 +272,7 @@ bool CDirect3D::Initialize(HWND hWnd) pD3D = Direct3DCreate9(D3D_SDK_VERSION); if(pD3D == NULL) { - DXTRACE_ERR_MSGBOX(L"Error creating initial D3D9 object", 0); + DXTRACE_ERR_MSGBOX(TEXT("Error creating initial D3D9 object"), 0); return false; } @@ -290,19 +290,19 @@ bool CDirect3D::Initialize(HWND hWnd) &dPresentParams, &pDevice); if(FAILED(hr)) { - DXTRACE_ERR_MSGBOX(L"Error creating D3D9 device", hr); + DXTRACE_ERR_MSGBOX(TEXT("Error creating D3D9 device"), hr); return false; } hr = pDevice->CreateVertexBuffer(sizeof(vertexStream),D3DUSAGE_WRITEONLY,0,D3DPOOL_MANAGED,&vertexBuffer,NULL); if(FAILED(hr)) { - DXTRACE_ERR_MSGBOX(L"Error creating vertex buffer", hr); + DXTRACE_ERR_MSGBOX(TEXT("Error creating vertex buffer"), hr); return false; } hr = pDevice->CreateVertexDeclaration(vertexElems,&vertexDeclaration); if(FAILED(hr)) { - DXTRACE_ERR_MSGBOX(L"Error creating vertex declaration", hr); + DXTRACE_ERR_MSGBOX(TEXT("Error creating vertex declaration"), hr); return false; } @@ -312,7 +312,7 @@ bool CDirect3D::Initialize(HWND hWnd) cgContext = cgCreateContext(); hr = cgD3D9SetDevice(pDevice); if(FAILED(hr)) { - DXTRACE_ERR_MSGBOX(L"Error setting cg device", hr); + DXTRACE_ERR_MSGBOX(TEXT("Error setting cg device"), hr); } cgShader = new CD3DCG(cgContext,pDevice); } @@ -650,14 +650,14 @@ void CDirect3D::Render(SSurface Src) ResetDevice(); return; default: - DXTRACE_ERR_MSGBOX( L"Internal driver error", hr); + DXTRACE_ERR_MSGBOX(TEXT("Internal driver error"), hr); return; } } //BlankTexture(drawSurface); if(FAILED(hr = drawSurface->LockRect(0, &lr, NULL, 0))) { - DXTRACE_ERR_MSGBOX( L"Unable to lock texture", hr); + DXTRACE_ERR_MSGBOX(TEXT("Unable to lock texture"), hr); return; } else { Dst.Surface = (unsigned char *)lr.pBits; @@ -757,7 +757,7 @@ void CDirect3D::CreateDrawSurface() NULL ); if(FAILED(hr)) { - DXTRACE_ERR_MSGBOX(L"Error while creating texture", hr); + DXTRACE_ERR_MSGBOX(TEXT("Error while creating texture"), hr); return; } } @@ -787,7 +787,7 @@ bool CDirect3D::BlankTexture(LPDIRECT3DTEXTURE9 texture) HRESULT hr; if(FAILED(hr = texture->LockRect(0, &lr, NULL, 0))) { - DXTRACE_ERR_MSGBOX( L"Unable to lock texture", hr); + DXTRACE_ERR_MSGBOX(TEXT("Unable to lock texture"), hr); return false; } else { memset(lr.pBits, 0, lr.Pitch * quadTextureSize); @@ -938,7 +938,7 @@ bool CDirect3D::ResetDevice() } if(FAILED(hr = pDevice->Reset(&dPresentParams))) { - DXTRACE_ERR(L"Unable to reset device", hr); + DXTRACE_ERR(TEXT("Unable to reset device"), hr); return false; } diff --git a/win32/CXAudio2.cpp b/win32/CXAudio2.cpp index 7bfdb6ef..84fa533f 100644 --- a/win32/CXAudio2.cpp +++ b/win32/CXAudio2.cpp @@ -234,7 +234,7 @@ bool CXAudio2::InitXAudio2(void) HRESULT hr; if ( FAILED(hr = XAudio2Create( &pXAudio2, 0 , XAUDIO2_DEFAULT_PROCESSOR ) ) ) { - DXTRACE_ERR_MSGBOX(L"Unable to create XAudio2 object.",hr); + DXTRACE_ERR_MSGBOX(TEXT("Unable to create XAudio2 object."),hr); MessageBox (GUI.hWnd, TEXT("\ Unable to initialize XAudio2. You will not be able to hear any\n\ sound effects or music while playing.\n\n\ @@ -257,7 +257,7 @@ bool CXAudio2::InitVoices(void) HRESULT hr; if ( FAILED(hr = pXAudio2->CreateMasteringVoice( &pMasterVoice, (Settings.Stereo?2:1), Settings.SoundPlaybackRate, 0, 0 , NULL ) ) ) { - DXTRACE_ERR_MSGBOX(L"Unable to create mastering voice.",hr); + DXTRACE_ERR_MSGBOX(TEXT("Unable to create mastering voice."),hr); return false; } @@ -272,7 +272,7 @@ bool CXAudio2::InitVoices(void) if( FAILED(hr = pXAudio2->CreateSourceVoice(&pSourceVoice, (WAVEFORMATEX*)&wfx, XAUDIO2_VOICE_NOSRC , XAUDIO2_DEFAULT_FREQ_RATIO, this, NULL, NULL ) ) ) { - DXTRACE_ERR_MSGBOX(L"Unable to create source voice.",hr); + DXTRACE_ERR_MSGBOX(TEXT("Unable to create source voice."),hr); return false; } diff --git a/win32/libpng/libpng.sln b/win32/libpng/libpng.sln new file mode 100644 index 00000000..c44e1d98 --- /dev/null +++ b/win32/libpng/libpng.sln @@ -0,0 +1,58 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng.vcxproj", "{95804E5F-B69E-4E2A-925E-52FAFC19EDBF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\zlib\zlib.vcxproj", "{99E9817A-4605-44AF-8433-7048F0EC1859}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug Unicode|x64 = Debug Unicode|x64 + Debug Unicode|x86 = Debug Unicode|x86 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release Unicode|x64 = Release Unicode|x64 + Release Unicode|x86 = Release Unicode|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug Unicode|x86.ActiveCfg = Debug Unicode|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug Unicode|x86.Build.0 = Debug Unicode|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug|x64.ActiveCfg = Debug|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug|x64.Build.0 = Debug|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug|x86.ActiveCfg = Debug|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug|x86.Build.0 = Debug|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release Unicode|x64.Build.0 = Release Unicode|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release Unicode|x86.ActiveCfg = Release Unicode|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release Unicode|x86.Build.0 = Release Unicode|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release|x64.ActiveCfg = Release|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release|x64.Build.0 = Release|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release|x86.ActiveCfg = Release|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release|x86.Build.0 = Release|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|x86.ActiveCfg = Debug Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|x86.Build.0 = Debug Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|x64.ActiveCfg = Debug|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|x64.Build.0 = Debug|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|x86.ActiveCfg = Debug|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|x86.Build.0 = Debug|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|x64.Build.0 = Release Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|x86.ActiveCfg = Release Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|x86.Build.0 = Release Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|x64.ActiveCfg = Release|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|x64.Build.0 = Release|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|x86.ActiveCfg = Release|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/win32/libpng/libpng.vcxproj b/win32/libpng/libpng.vcxproj new file mode 100644 index 00000000..6978b9b4 --- /dev/null +++ b/win32/libpng/libpng.vcxproj @@ -0,0 +1,438 @@ + + + + + Debug Unicode + Win32 + + + Debug Unicode + x64 + + + Debug + Win32 + + + Release Unicode + Win32 + + + Release Unicode + x64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + {99e9817a-4605-44af-8433-7048f0ec1859} + + + + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF} + Win32Proj + libpng + 8.1 + + + + StaticLibrary + true + v140 + NotSet + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + NotSet + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + true + v140 + NotSet + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + NotSet + + + StaticLibrary + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + + + + Create + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + pngpriv.h + Default + true + MultiThreadedDebug + true + false + false + + + Windows + true + + + + + + + IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" ( +COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h" +) + + + + + Create + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + pngpriv.h + Default + true + false + false + true + false + MultiThreadedDebug + + + Windows + true + + + + + + + IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" ( +COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h" +) + + + + + Create + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + pngpriv.h + Default + true + MultiThreadedDebug + true + false + false + false + + + Windows + true + + + + + + + IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" ( +COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h" +) + + + + + Create + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + pngpriv.h + Default + true + MultiThreadedDebug + true + false + false + false + + + Windows + true + + + + + + + IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" ( +COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h" +) + + + + + Level3 + Create + MaxSpeed + false + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + pngpriv.h + Default + true + Speed + true + true + MultiThreaded + false + + + Windows + true + true + true + + + + + + + IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" ( +COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h" +) + + + + + Level3 + Create + MaxSpeed + false + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + pngpriv.h + Default + true + true + Speed + true + MultiThreaded + false + + + Windows + true + true + true + + + + + + + IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" ( +COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h" +) + + + + + Level3 + Create + MaxSpeed + false + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + pngpriv.h + Default + true + Speed + true + true + MultiThreaded + false + + + Windows + true + true + true + + + + + + + IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" ( +COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h" +) + + + + + Level3 + Create + MaxSpeed + false + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + pngpriv.h + Default + true + true + Speed + true + MultiThreaded + false + + + Windows + true + true + true + + + + + + + IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" ( +COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h" +) + + + + + + \ No newline at end of file diff --git a/win32/libpng/libpng.vcxproj.filters b/win32/libpng/libpng.vcxproj.filters new file mode 100644 index 00000000..b84cade9 --- /dev/null +++ b/win32/libpng/libpng.vcxproj.filters @@ -0,0 +1,64 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/win32/snes9xw.sln b/win32/snes9xw.sln index ba09e020..f22ef5c1 100644 --- a/win32/snes9xw.sln +++ b/win32/snes9xw.sln @@ -5,6 +5,10 @@ VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Snes9X", "snes9xw.vcxproj", "{B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\libpng.vcxproj", "{95804E5F-B69E-4E2A-925E-52FAFC19EDBF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{99E9817A-4605-44AF-8433-7048F0EC1859}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Unicode|Win32 = Debug Unicode|Win32 @@ -33,6 +37,38 @@ 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 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug|Win32.ActiveCfg = Debug|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug|Win32.Build.0 = Debug|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug|x64.ActiveCfg = Debug|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Debug|x64.Build.0 = Debug|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release Unicode|Win32.Build.0 = Release Unicode|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release Unicode|x64.Build.0 = Release Unicode|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release|Win32.ActiveCfg = Release|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release|Win32.Build.0 = Release|Win32 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release|x64.ActiveCfg = Release|x64 + {95804E5F-B69E-4E2A-925E-52FAFC19EDBF}.Release|x64.Build.0 = Release|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|Win32.ActiveCfg = Debug|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|Win32.Build.0 = Debug|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|x64.ActiveCfg = Debug|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|x64.Build.0 = Debug|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|Win32.Build.0 = Release Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|x64.Build.0 = Release Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|Win32.ActiveCfg = Release|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|Win32.Build.0 = Release|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|x64.ActiveCfg = Release|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win32/snes9xw.vcxproj b/win32/snes9xw.vcxproj index ad885fcc..a5071fea 100644 --- a/win32/snes9xw.vcxproj +++ b/win32/snes9xw.vcxproj @@ -43,52 +43,52 @@ Application - v140_xp + v140 false Unicode true Application - v140_xp + v140 false Unicode Application - v140_xp + v140 false NotSet Application - v140_xp + v140 false true NotSet Application - v140_xp + v140 false Unicode true Application - v140_xp + v140 false Unicode Application - v140_xp + v140 false NotSet Application - v140_xp + v140 false true NotSet @@ -126,63 +126,67 @@ false - $(ProjectDir) - $(Platform)\$(Configuration)\ - snes9x - $(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath) + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) + $(IncludePath);$(DXSDK_DIR)include;$(CG_INC_PATH) + $(LibraryPath);$(DXSDK_DIR)Lib\$(PlatformTarget);$(CG_LIB_PATH) false - snes9x-x64 - $(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(LibraryPath) - $(ProjectDir) + $(ProjectName) + $(IncludePath);$(DXSDK_DIR)include;$(CG_INC_PATH) + $(LibraryPath);$(DXSDK_DIR)Lib\$(PlatformTarget);$(CG_LIB_PATH).x64 + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ false - $(ProjectDir) - $(Platform)\$(Configuration)\ - snes9x-debug - $(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath) + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) + $(IncludePath);$(DXSDK_DIR)include;$(CG_INC_PATH) + $(LibraryPath);$(DXSDK_DIR)Lib\$(PlatformTarget);$(CG_LIB_PATH) false - snes9x-debug-x64 - $(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(LibraryPath) - $(ProjectDir) + $(ProjectName) + $(IncludePath);$(DXSDK_DIR)include;$(CG_INC_PATH) + $(LibraryPath);$(DXSDK_DIR)Lib\$(PlatformTarget);$(CG_LIB_PATH).x64 + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ false - $(ProjectDir) - $(Platform)\$(Configuration)\ - snes9x-debug - $(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath) + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) + $(IncludePath);$(DXSDK_DIR)include;$(CG_INC_PATH) + $(LibraryPath);$(DXSDK_DIR)Lib\$(PlatformTarget);$(CG_LIB_PATH) false - snes9x-debug-x64 - $(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(LibraryPath) - $(ProjectDir) + $(ProjectName) + $(IncludePath);$(DXSDK_DIR)include;$(CG_INC_PATH) + $(LibraryPath);$(DXSDK_DIR)Lib\$(PlatformTarget);$(CG_LIB_PATH).x64 + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ false - $(ProjectDir) - $(Platform)\$(Configuration)\ - snes9x - $(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath) + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) + $(IncludePath);$(DXSDK_DIR)include;$(CG_INC_PATH) + $(LibraryPath);$(DXSDK_DIR)Lib\$(PlatformTarget);$(CG_LIB_PATH) false - snes9x-x64 - $(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(LibraryPath) - $(ProjectDir) + $(ProjectName) + $(IncludePath);$(DXSDK_DIR)include;$(CG_INC_PATH) + $(LibraryPath);$(DXSDK_DIR)Lib\$(PlatformTarget);$(CG_LIB_PATH).x64 + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ @@ -200,7 +204,7 @@ Speed true true - $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\libPNG\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\fmodex\api\inc;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;%(PreprocessorDefinitions) true MultiThreaded @@ -220,12 +224,12 @@ 0x0409 - libpngmt.lib;comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;zlibmt.lib;msxml2.lib;shlwapi.lib;%(AdditionalDependencies) + comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;msxml2.lib;shlwapi.lib;xaudio2.lib;%(AdditionalDependencies) true $(ProjectDir)..\..\FMOD\api\lib;$(ProjectDir)..\..\FMODEx_x64\api\lib;$(ProjectDir)..\..\FMODEx\api\lib;$(ProjectDir)..\i386;$(ProjectDir)..\..\zlib\lib;$(ProjectDir)..\..\libPNG\lib;%(AdditionalLibraryDirectories) fmod.dll;fmodex.dll;%(DelayLoadDLLs) true - $(IntDir)snes9x.pdb + $(IntDir)$(ProjectName).pdb Windows false @@ -249,7 +253,7 @@ Speed true true - $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\libPNG\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\fmodex\api\inc;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;%(PreprocessorDefinitions) true MultiThreaded @@ -269,12 +273,12 @@ 0x0409 - libpngmtx64.lib;comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;zlibmtx64.lib;msxml2.lib;shlwapi.lib;%(AdditionalDependencies) + comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;msxml2.lib;shlwapi.lib;xaudio2.lib;%(AdditionalDependencies) true $(ProjectDir)..\..\FMOD\api\lib;$(ProjectDir)..\..\FMODEx_x64\api\lib;$(ProjectDir)..\..\FMODEx\api\lib;$(ProjectDir)..\i386;$(ProjectDir)..\..\zlib\lib;$(ProjectDir)..\..\libPNG\lib;%(AdditionalLibraryDirectories) fmod.dll;fmodex64.dll;%(DelayLoadDLLs) true - $(IntDir)snes9x-x64.pdb + $(IntDir)$(ProjectName).pdb Windows false @@ -293,7 +297,7 @@ Disabled - $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\libPNG\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\fmodex\api\inc;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) _DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;D3D_DEBUG_INFO;%(PreprocessorDefinitions) MultiThreadedDebug Default @@ -313,13 +317,13 @@ 0x0409 - libpngdmt.lib;comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;zlibdmt.lib;msxml2.lib;shlwapi.lib;%(AdditionalDependencies) + comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;msxml2.lib;shlwapi.lib;xaudio2.lib;%(AdditionalDependencies) true $(ProjectDir)..\..\FMOD\api\lib;$(ProjectDir)..\..\FMODEx_x64\api\lib;$(ProjectDir)..\..\FMODEx\api\lib;$(ProjectDir)..\i386;$(ProjectDir)..\..\zlib\lib;$(ProjectDir)..\..\libPNG\lib;%(AdditionalLibraryDirectories) false fmod.dll;fmodex.dll;%(DelayLoadDLLs) true - $(IntDir)snes9x-debug.pdb + $(IntDir)$(ProjectName).pdb false Windows false @@ -339,7 +343,7 @@ Disabled - $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\libPNG\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\fmodex\api\inc;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) _DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;D3D_DEBUG_INFO;%(PreprocessorDefinitions) MultiThreadedDebug Default @@ -359,13 +363,13 @@ 0x0409 - libpngdmtx64.lib;comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;zlibdmtx64.lib;msxml2.lib;shlwapi.lib;%(AdditionalDependencies) + comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;msxml2.lib;shlwapi.lib;xaudio2.lib;%(AdditionalDependencies) true $(ProjectDir)..\..\FMOD\api\lib;$(ProjectDir)..\..\FMODEx_x64\api\lib;$(ProjectDir)..\..\FMODEx\api\lib;$(ProjectDir)..\i386;$(ProjectDir)..\..\zlib\lib;$(ProjectDir)..\..\libPNG\lib;%(AdditionalLibraryDirectories) false fmodex64.dll;%(DelayLoadDLLs) true - $(IntDir)snes9x-debug-x64.pdb + $(IntDir)$(ProjectName).pdb false Windows false @@ -385,7 +389,7 @@ Disabled - $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\libPNG\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\fmodex\api\inc;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) _DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;D3D_DEBUG_INFO;%(PreprocessorDefinitions) MultiThreadedDebug Default @@ -405,13 +409,13 @@ 0x0409 - libpngdmt.lib;comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;zlibdmtu.lib;msxml2.lib;shlwapi.lib;%(AdditionalDependencies) + comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;msxml2.lib;shlwapi.lib;xaudio2.lib;%(AdditionalDependencies) true $(ProjectDir)..\..\FMOD\api\lib;$(ProjectDir)..\..\FMODEx_x64\api\lib;$(ProjectDir)..\..\FMODEx\api\lib;$(ProjectDir)..\i386;$(ProjectDir)..\..\zlib\lib;$(ProjectDir)..\..\libPNG\lib;%(AdditionalLibraryDirectories) false fmod.dll;fmodex.dll;%(DelayLoadDLLs) true - $(IntDir)snes9x-debug.pdb + $(IntDir)$(ProjectName).pdb false Windows false @@ -432,7 +436,7 @@ Disabled - $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\libPNG\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\fmodex\api\inc;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) _DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;D3D_DEBUG_INFO;%(PreprocessorDefinitions) MultiThreadedDebug Default @@ -452,13 +456,13 @@ 0x0409 - libpngdmtx64.lib;comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;zlibdmtux64.lib;msxml2.lib;shlwapi.lib;%(AdditionalDependencies) + comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;msxml2.lib;shlwapi.lib;xaudio2.lib;%(AdditionalDependencies) true $(ProjectDir)..\..\FMOD\api\lib;$(ProjectDir)..\..\FMODEx_x64\api\lib;$(ProjectDir)..\..\FMODEx\api\lib;$(ProjectDir)..\i386;$(ProjectDir)..\..\zlib\lib;$(ProjectDir)..\..\libPNG\lib;%(AdditionalLibraryDirectories) false fmodex64.dll;%(DelayLoadDLLs) true - $(IntDir)snes9x-debug-x64.pdb + $(IntDir)$(ProjectName).pdb false Windows false @@ -484,7 +488,7 @@ Speed true true - $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\libPNG\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\fmodex\api\inc;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;%(PreprocessorDefinitions) true MultiThreaded @@ -505,12 +509,12 @@ 0x0409 - libpngmt.lib;comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;zlibmtu.lib;msxml2.lib;shlwapi.lib;%(AdditionalDependencies) + comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;msxml2.lib;shlwapi.lib;xaudio2.lib;%(AdditionalDependencies) true $(ProjectDir)..\..\FMOD\api\lib;$(ProjectDir)..\..\FMODEx_x64\api\lib;$(ProjectDir)..\..\FMODEx\api\lib;$(ProjectDir)..\i386;$(ProjectDir)..\..\zlib\lib;$(ProjectDir)..\..\libPNG\lib;%(AdditionalLibraryDirectories) fmod.dll;fmodex.dll;%(DelayLoadDLLs) true - $(IntDir)snes9x.pdb + $(IntDir)$(ProjectName).pdb Windows false @@ -535,7 +539,7 @@ Speed true true - $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\libPNG\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\FMOD\api\inc;$(ProjectDir)..\..\fmodex\api\inc;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;FMODEX_SUPPORT;NETPLAY_SUPPORT;%(PreprocessorDefinitions) true MultiThreaded @@ -556,12 +560,12 @@ 0x0409 - libpngmtx64.lib;comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;zlibmtux64.lib;msxml2.lib;shlwapi.lib;%(AdditionalDependencies) + comctl32.lib;winmm.lib;opengl32.lib;glu32.lib;wsock32.lib;ddraw.lib;dsound.lib;dxguid.lib;delayimp.lib;vfw32.lib;msxml2.lib;shlwapi.lib;xaudio2.lib;%(AdditionalDependencies) true $(ProjectDir)..\..\FMOD\api\lib;$(ProjectDir)..\..\FMODEx_x64\api\lib;$(ProjectDir)..\..\FMODEx\api\lib;$(ProjectDir)..\i386;$(ProjectDir)..\..\zlib\lib;$(ProjectDir)..\..\libPNG\lib;%(AdditionalLibraryDirectories) fmod.dll;fmodex64.dll;%(DelayLoadDLLs) true - $(IntDir)snes9x-x64.pdb + $(IntDir)$(ProjectName).pdb Windows false @@ -1054,6 +1058,14 @@ + + + {95804e5f-b69e-4e2a-925e-52fafc19edbf} + + + {99e9817a-4605-44af-8433-7048f0ec1859} + + diff --git a/win32/zlib/zlib.sln b/win32/zlib/zlib.sln index 0b178107..259d1b41 100644 --- a/win32/zlib/zlib.sln +++ b/win32/zlib/zlib.sln @@ -1,38 +1,38 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{99E9817A-4605-44AF-8433-7048F0EC1859}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - LIB Debug S9xUnicode|Win32 = LIB Debug S9xUnicode|Win32 - LIB Debug S9xUnicode|x64 = LIB Debug S9xUnicode|x64 - LIB Debug|Win32 = LIB Debug|Win32 - LIB Debug|x64 = LIB Debug|x64 - LIB Release S9xUnicode|Win32 = LIB Release S9xUnicode|Win32 - LIB Release S9xUnicode|x64 = LIB Release S9xUnicode|x64 - LIB Release|Win32 = LIB Release|Win32 - LIB Release|x64 = LIB Release|x64 + Debug Unicode|Win32 = Debug Unicode|Win32 + Debug Unicode|x64 = Debug Unicode|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release Unicode|Win32 = Release Unicode|Win32 + Release Unicode|x64 = Release Unicode|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Debug S9xUnicode|Win32.ActiveCfg = LIB Debug S9xUnicode|Win32 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Debug S9xUnicode|Win32.Build.0 = LIB Debug S9xUnicode|Win32 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Debug S9xUnicode|x64.ActiveCfg = LIB Debug S9xUnicode|x64 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Debug S9xUnicode|x64.Build.0 = LIB Debug S9xUnicode|x64 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Debug|Win32.ActiveCfg = LIB Debug|Win32 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Debug|Win32.Build.0 = LIB Debug|Win32 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Debug|x64.ActiveCfg = LIB Debug|x64 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Debug|x64.Build.0 = LIB Debug|x64 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Release S9xUnicode|Win32.ActiveCfg = LIB Release S9xUnicode|Win32 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Release S9xUnicode|Win32.Build.0 = LIB Release S9xUnicode|Win32 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Release S9xUnicode|x64.ActiveCfg = LIB Release S9xUnicode|x64 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Release S9xUnicode|x64.Build.0 = LIB Release S9xUnicode|x64 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Release|Win32.ActiveCfg = LIB Release|Win32 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Release|Win32.Build.0 = LIB Release|Win32 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Release|x64.ActiveCfg = LIB Release|x64 - {99E9817A-4605-44AF-8433-7048F0EC1859}.LIB Release|x64.Build.0 = LIB Release|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|Win32.ActiveCfg = Debug|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|Win32.Build.0 = Debug|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|x64.ActiveCfg = Debug|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Debug|x64.Build.0 = Debug|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|Win32.Build.0 = Release Unicode|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release Unicode|x64.Build.0 = Release Unicode|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|Win32.ActiveCfg = Release|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|Win32.Build.0 = Release|Win32 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|x64.ActiveCfg = Release|x64 + {99E9817A-4605-44AF-8433-7048F0EC1859}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win32/zlib/zlib.vcproj b/win32/zlib/zlib.vcproj deleted file mode 100644 index d14adf81..00000000 --- a/win32/zlib/zlib.vcproj +++ /dev/null @@ -1,795 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/zlib/zlib.vcxproj b/win32/zlib/zlib.vcxproj index 1c4207ff..c05d7615 100644 --- a/win32/zlib/zlib.vcxproj +++ b/win32/zlib/zlib.vcxproj @@ -1,36 +1,36 @@  - - LIB Debug S9xUnicode + + Debug Unicode Win32 - - LIB Debug S9xUnicode + + Debug Unicode x64 - - LIB Debug + + Debug Win32 - - LIB Debug + + Debug x64 - - LIB Release S9xUnicode + + Release Unicode Win32 - - LIB Release S9xUnicode + + Release Unicode x64 - - LIB Release + + Release Win32 - - LIB Release + + Release x64 @@ -41,297 +41,343 @@ 8.1 - + StaticLibrary - v140_xp + v140 Unicode true - + StaticLibrary - v140_xp + v140 Unicode - + StaticLibrary - v140_xp + v140 NotSet true - + StaticLibrary - v140_xp + v140 NotSet - + StaticLibrary - v140_xp + v140 Unicode true - + StaticLibrary - v140_xp + v140 Unicode - + StaticLibrary - v140_xp + v140 NotSet true - + StaticLibrary - v140_xp + v140 NotSet - + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.30501.0 - - $(SolutionDir)..\..\..\zlib\lib\ - $(OutDir)..\..\..\zlib\lib\ZLIB_Debug\ - zlibdmt + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) - - $(SolutionDir)..\..\..\zlib\lib\ - $(OutDir)..\..\..\zlib\lib\ZLIB_Debug_x64\ - zlibdmtx64 + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) - - $(SolutionDir)..\..\..\zlib\lib\ - $(OutDir)..\..\..\zlib\lib\ZLIB_Release\ - zlibmt + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) - - $(SolutionDir)..\..\..\zlib\lib\ - $(OutDir)..\..\..\zlib\lib\ZLIB_Release_x64\ - zlibmtx64 + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) - - $(SolutionDir)..\..\..\zlib\lib\ - $(OutDir)..\..\..\zlib\lib\ZLIB_Debug_U\ - zlibdmtu + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) - - $(SolutionDir)..\..\..\zlib\lib\ - $(OutDir)..\..\..\zlib\lib\ZLIB_Debug_U_x64\ - zlibdmtux64 + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) - - $(SolutionDir)..\..\..\zlib\lib\ - $(OutDir)..\..\..\zlib\lib\ZLIB_Release_U\ - zlibmtu + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) - - $(SolutionDir)..\..\..\zlib\lib\ - $(OutDir)..\..\..\zlib\lib\ZLIB_Release_U_x64\ - zlibmtux64 + + $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ + $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ + $(ProjectName) - + Disabled - ..\..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug - $(OutDir)zlibdmt.pdb + $(OutDir)$(ProjectName).pdb Level3 EditAndContinue - $(SolutionDir)..\_tfwopen.h;%(ForcedIncludeFiles) + $(ProjectDir)..\_tfwopen.h;%(ForcedIncludeFiles) 0x0409 - ..\..\..\zlib\contrib\masmx86\match686.obj;..\..\..\zlib\contrib\masmx86\inffas32.obj;%(AdditionalDependencies) + $(IntDir)match686.obj;$(IntDir)inffas32.obj;%(AdditionalDependencies) + + ml /Fo "$(IntDir)match686.obj" /coff /Zi /c "$(ProjectDir)..\..\..\zlib\contrib\masmx86\match686.asm" +ml /Fo "$(IntDir)inffas32.obj" /coff /Zi /c "$(ProjectDir)..\..\..\zlib\contrib\masmx86\inffas32.asm" + + + - + X64 Disabled - ..\..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;ASMV;ASMINF;_WINDOWS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;_DEBUG;ASMV;ASMINF;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug - $(OutDir)zlibdmtx64.pdb + $(OutDir)$(ProjectName).pdb Level3 ProgramDatabase - $(SolutionDir)..\_tfwopen.h;%(ForcedIncludeFiles) + $(ProjectDir)..\_tfwopen.h;%(ForcedIncludeFiles) 0x0409 - ..\..\..\zlib\contrib\masmx64\gvmat64.obj;..\..\..\zlib\contrib\masmx64\inffasx64.obj;%(AdditionalDependencies) + $(IntDir)gvmat64.obj;$(IntDir)inffasx64.obj;%(AdditionalDependencies) + + ml64 /Fo "$(IntDir)gvmat64.obj" /Zi /c "..\..\..\zlib\contrib\masmx64\gvmat64.asm" +ml64 /Fo "$(IntDir)inffasx64.obj" /Zi /c "..\..\..\zlib\contrib\masmx64\inffasx64.asm" + - + MaxSpeed true - ..\..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded true - $(OutDir)zlibmt.pdb + $(OutDir)$(ProjectName).pdb Level3 ProgramDatabase - $(SolutionDir)..\_tfwopen.h;%(ForcedIncludeFiles) + $(ProjectDir)..\_tfwopen.h;%(ForcedIncludeFiles) - ..\..\..\zlib\contrib\masmx86\match686.obj;..\..\..\zlib\contrib\masmx86\inffas32.obj;%(AdditionalDependencies) + $(IntDir)match686.obj;$(IntDir)inffas32.obj;%(AdditionalDependencies) + + ml /Fo "$(IntDir)match686.obj" /coff /Zi /c "$(ProjectDir)..\..\..\zlib\contrib\masmx86\match686.asm" +ml /Fo "$(IntDir)inffas32.obj" /coff /Zi /c "$(ProjectDir)..\..\..\zlib\contrib\masmx86\inffas32.asm" + + + + + - + X64 MaxSpeed true - ..\..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded true - $(OutDir)zlibmtx64.pdb + $(OutDir)$(ProjectName).pdb Level3 ProgramDatabase - $(SolutionDir)..\_tfwopen.h;%(ForcedIncludeFiles) + $(ProjectDir)..\_tfwopen.h;%(ForcedIncludeFiles) - ..\..\..\zlib\contrib\masmx64\gvmat64.obj;..\..\..\zlib\contrib\masmx64\inffasx64.obj;%(AdditionalDependencies) + $(IntDir)gvmat64.obj;$(IntDir)inffasx64.obj;%(AdditionalDependencies) + + ml64 /Fo "$(IntDir)gvmat64.obj" /Zi /c "..\..\..\zlib\contrib\masmx64\gvmat64.asm" +ml64 /Fo "$(IntDir)inffasx64.obj" /Zi /c "..\..\..\zlib\contrib\masmx64\inffasx64.asm" + - + Disabled - ..\..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;ASMV;ASMINF;_WINDOWS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;_DEBUG;ASMV;ASMINF;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug - $(OutDir)zlibdmtu.pdb + $(OutDir)$(ProjectName).pdb Level3 EditAndContinue - $(SolutionDir)..\_tfwopen.h;%(ForcedIncludeFiles) + $(ProjectDir)..\_tfwopen.h;%(ForcedIncludeFiles) 0x0409 - ..\..\..\zlib\contrib\masmx86\match686.obj;..\..\..\zlib\contrib\masmx86\inffas32.obj;%(AdditionalDependencies) + $(IntDir)match686.obj;$(IntDir)inffas32.obj;%(AdditionalDependencies) + + ml /Fo "$(IntDir)match686.obj" /coff /Zi /c "$(ProjectDir)..\..\..\zlib\contrib\masmx86\match686.asm" +ml /Fo "$(IntDir)inffas32.obj" /coff /Zi /c "$(ProjectDir)..\..\..\zlib\contrib\masmx86\inffas32.asm" + + + + + - + X64 Disabled - ..\..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;ASMV;ASMINF;_WINDOWS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;_DEBUG;ASMV;ASMINF;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug - $(OutDir)zlibdmtux64.pdb + $(OutDir)$(ProjectName).pdb Level3 ProgramDatabase - $(SolutionDir)..\_tfwopen.h;%(ForcedIncludeFiles) + $(ProjectDir)..\_tfwopen.h;%(ForcedIncludeFiles) 0x0409 - ..\..\..\zlib\contrib\masmx64\gvmat64.obj;..\..\..\zlib\contrib\masmx64\inffasx64.obj;%(AdditionalDependencies) + $(IntDir)gvmat64.obj;$(IntDir)inffasx64.obj;%(AdditionalDependencies) + + ml64 /Fo "$(IntDir)gvmat64.obj" /Zi /c "..\..\..\zlib\contrib\masmx64\gvmat64.asm" +ml64 /Fo "$(IntDir)inffasx64.obj" /Zi /c "..\..\..\zlib\contrib\masmx64\inffasx64.asm" + - + MaxSpeed true - ..\..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;ASMV;ASMINF;_WINDOWS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;NDEBUG;ASMV;ASMINF;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded true - $(OutDir)zlibmtu.pdb + $(OutDir)$(ProjectName).pdb Level3 ProgramDatabase - $(SolutionDir)..\_tfwopen.h;%(ForcedIncludeFiles) + $(ProjectDir)..\_tfwopen.h;%(ForcedIncludeFiles) - ..\..\..\zlib\contrib\masmx86\match686.obj;..\..\..\zlib\contrib\masmx86\inffas32.obj;%(AdditionalDependencies) + $(IntDir)match686.obj;$(IntDir)inffas32.obj;%(AdditionalDependencies) + + ml /Fo "$(IntDir)match686.obj" /coff /Zi /c "$(ProjectDir)..\..\..\zlib\contrib\masmx86\match686.asm" +ml /Fo "$(IntDir)inffas32.obj" /coff /Zi /c "$(ProjectDir)..\..\..\zlib\contrib\masmx86\inffas32.asm" + + + + + - + X64 MaxSpeed true - ..\..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;ASMV;ASMINF;_WINDOWS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;NDEBUG;ASMV;ASMINF;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded true - $(OutDir)zlibmtux64.pdb + $(OutDir)$(ProjectName).pdb Level3 ProgramDatabase - $(SolutionDir)..\_tfwopen.h;%(ForcedIncludeFiles) + $(ProjectDir)..\_tfwopen.h;%(ForcedIncludeFiles) - ..\..\..\zlib\contrib\masmx64\gvmat64.obj;..\..\..\zlib\contrib\masmx64\inffasx64.obj;%(AdditionalDependencies) + $(IntDir)gvmat64.obj;$(IntDir)inffasx64.obj;%(AdditionalDependencies) + + ml64 /Fo "$(IntDir)gvmat64.obj" /Zi /c "..\..\..\zlib\contrib\masmx64\gvmat64.asm" +ml64 /Fo "$(IntDir)inffasx64.obj" /Zi /c "..\..\..\zlib\contrib\masmx64\inffasx64.asm" + - true - true - true - true + true + true + true + true @@ -349,14 +395,14 @@ - true - true - true - true - true - true - true - true + true + true + true + true + true + true + true + true