ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix up wx msvc

This commit is contained in:
zeromus 2010-11-24 23:58:21 +00:00
parent da27b3e49e
commit fde699f8d9
2 changed files with 166 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/movie.cpp
View File

@ -999,7 +999,7 @@ bool mov_loadstate(EMUFILE* fp, int size)
if(tempMovieData.guid != currMovieData.guid) if(tempMovieData.guid != currMovieData.guid)
{ {
//mbg 8/18/08 - this code can be used to turn the error message into an OK/CANCEL //mbg 8/18/08 - this code can be used to turn the error message into an OK/CANCEL
#ifdef WIN32 #if defined(WIN32) && !defined(WXPORT)
std::string msg = "There is a mismatch between savestate's movie and current movie.\ncurrent: " + currMovieData.guid.toString() + "\nsavestate: " + tempMovieData.guid.toString() + "\n\nThis means that you have loaded a savestate belonging to a different movie than the one you are playing now.\n\nContinue loading this savestate anyway?"; std::string msg = "There is a mismatch between savestate's movie and current movie.\ncurrent: " + currMovieData.guid.toString() + "\nsavestate: " + tempMovieData.guid.toString() + "\n\nThis means that you have loaded a savestate belonging to a different movie than the one you are playing now.\n\nContinue loading this savestate anyway?";
int result = MessageBox(MainWindow->getHWnd(),msg.c_str(),"Error loading savestate",MB_OKCANCEL); int result = MessageBox(MainWindow->getHWnd(),msg.c_str(),"Error loading savestate",MB_OKCANCEL);
if(result == IDCANCEL) if(result == IDCANCEL)

186
desmume/src/wx/wxDeSmuME_2008.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9,00" Version="9.00"
Name="wxDeSmuME_VS2008" Name="wxDeSmuME_VS2008"
ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}" ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
RootNamespace="DeSmuME" RootNamespace="DeSmuME"
@ -79,10 +79,10 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Rpcrt4.lib directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-Win32-debug.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib wxbase28d.lib wxmsw28d_core.lib sdl-vc8-Win32.lib" AdditionalDependencies="Rpcrt4.lib directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua51.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib wxbase28d.lib wxmsw28d_core.lib sdl-vc8-Win32.lib"
OutputFile="$(OutDir)\$(ProjectName)_debug.exe" OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs" AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs;.libs\win32"
DelayLoadDLLs="" DelayLoadDLLs="lua51.dll"
GenerateDebugInformation="true" GenerateDebugInformation="true"
GenerateMapFile="true" GenerateMapFile="true"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
@ -172,10 +172,10 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Rpcrt4.lib directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib wxbase28.lib wxmsw28_core.lib sdl-vc8-Win32.lib" AdditionalDependencies="Rpcrt4.lib directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua51.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib wxbase28.lib wxmsw28_core.lib sdl-vc8-Win32.lib"
OutputFile="$(OutDir)\$(ProjectName)_release.exe" OutputFile="$(OutDir)\$(ProjectName)_release.exe"
AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs" AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs;.libs\win32"
DelayLoadDLLs="" DelayLoadDLLs="lua51.dll"
GenerateDebugInformation="true" GenerateDebugInformation="true"
OptimizeReferences="2" OptimizeReferences="2"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
@ -266,10 +266,10 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Rpcrt4.lib directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib wxbase28.lib wxmsw28_core.lib sdl-vc8-Win32.lib" AdditionalDependencies="Rpcrt4.lib directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua51.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib wxbase28.lib wxmsw28_core.lib sdl-vc8-Win32.lib"
OutputFile="$(OutDir)\$(ProjectName)_dev+.exe" OutputFile="$(OutDir)\$(ProjectName)_dev+.exe"
AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs" AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs;.libs\win32"
DelayLoadDLLs="" DelayLoadDLLs="lua51.dll"
GenerateDebugInformation="true" GenerateDebugInformation="true"
OptimizeReferences="2" OptimizeReferences="2"
LinkTimeCodeGeneration="0" LinkTimeCodeGeneration="0"
@ -717,6 +717,14 @@
RelativePath="..\driver.h" RelativePath="..\driver.h"
> >
</File> </File>
<File
RelativePath="..\emufat.cpp"
>
</File>
<File
RelativePath="..\emufat.h"
>
</File>
<File <File
RelativePath="..\emufile.cpp" RelativePath="..\emufile.cpp"
> >
@ -845,6 +853,10 @@
RelativePath="..\OGLRender.h" RelativePath="..\OGLRender.h"
> >
</File> </File>
<File
RelativePath="..\path.cpp"
>
</File>
<File <File
RelativePath="..\path.h" RelativePath="..\path.h"
> >
@ -905,6 +917,14 @@
RelativePath="..\shaders.h" RelativePath="..\shaders.h"
> >
</File> </File>
<File
RelativePath="..\slot1.cpp"
>
</File>
<File
RelativePath="..\slot1.h"
>
</File>
<File <File
RelativePath="..\softrender.h" RelativePath="..\softrender.h"
> >
@ -1004,6 +1024,18 @@
RelativePath="..\addons\rumblepak.cpp" RelativePath="..\addons\rumblepak.cpp"
> >
</File> </File>
<File
RelativePath="..\addons\slot1_none.cpp"
>
</File>
<File
RelativePath="..\addons\slot1_r4.cpp"
>
</File>
<File
RelativePath="..\addons\slot1_retail.cpp"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="gdbstub" Name="gdbstub"
@ -1028,6 +1060,14 @@
RelativePath="..\utils\ConvertUTF.h" RelativePath="..\utils\ConvertUTF.h"
> >
</File> </File>
<File
RelativePath="..\utils\datetime.cpp"
>
</File>
<File
RelativePath="..\utils\datetime.h"
>
</File>
<File <File
RelativePath="..\utils\dlditool.cpp" RelativePath="..\utils\dlditool.cpp"
> >
@ -1048,14 +1088,6 @@
RelativePath="..\utils\md5.h" RelativePath="..\utils\md5.h"
> >
</File> </File>
<File
RelativePath="..\utils\mkgmtime.cpp"
>
</File>
<File
RelativePath="..\utils\mkgmtime.h"
>
</File>
<File <File
RelativePath="..\utils\task.cpp" RelativePath="..\utils\task.cpp"
> >
@ -1100,6 +1132,118 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="libfat"
>
<File
RelativePath="..\utils\libfat\bit_ops.h"
>
</File>
<File
RelativePath="..\utils\libfat\cache.cpp"
>
</File>
<File
RelativePath="..\utils\libfat\cache.h"
>
</File>
<File
RelativePath="..\utils\libfat\common.h"
>
</File>
<File
RelativePath="..\utils\libfat\directory.cpp"
>
</File>
<File
RelativePath="..\utils\libfat\directory.h"
>
</File>
<File
RelativePath="..\utils\libfat\disc.cpp"
>
</File>
<File
RelativePath="..\utils\libfat\disc.h"
>
</File>
<File
RelativePath="..\utils\libfat\disc_io.h"
>
</File>
<File
RelativePath="..\utils\libfat\fat.h"
>
</File>
<File
RelativePath="..\utils\libfat\fatdir.cpp"
>
</File>
<File
RelativePath="..\utils\libfat\fatdir.h"
>
</File>
<File
RelativePath="..\utils\libfat\fatfile.cpp"
>
</File>
<File
RelativePath="..\utils\libfat\fatfile.h"
>
</File>
<File
RelativePath="..\utils\libfat\file_allocation_table.cpp"
>
</File>
<File
RelativePath="..\utils\libfat\file_allocation_table.h"
>
</File>
<File
RelativePath="..\utils\libfat\filetime.cpp"
>
</File>
<File
RelativePath="..\utils\libfat\filetime.h"
>
</File>
<File
RelativePath="..\utils\libfat\libfat.cpp"
>
</File>
<File
RelativePath="..\utils\libfat\libfat_pc.h"
>
</File>
<File
RelativePath="..\utils\libfat\libfat_public_api.cpp"
>
</File>
<File
RelativePath="..\utils\libfat\libfat_public_api.h"
>
</File>
<File
RelativePath="..\utils\libfat\lock.cpp"
>
</File>
<File
RelativePath="..\utils\libfat\lock.h"
>
</File>
<File
RelativePath="..\utils\libfat\mem_allocate.h"
>
</File>
<File
RelativePath="..\utils\libfat\partition.cpp"
>
</File>
<File
RelativePath="..\utils\libfat\partition.h"
>
</File>
</Filter>
</Filter> </Filter>
<Filter <Filter
Name="metaspu" Name="metaspu"
@ -1572,7 +1716,7 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*&#x0D;&#x0A;" CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag"
AdditionalDependencies="7z.exe;un7z_and_touch.bat" AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\lua.tag" Outputs=".libs\lua.tag"
/> />
@ -1582,7 +1726,7 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*&#x0D;&#x0A;" CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag"
AdditionalDependencies="7z.exe;un7z_and_touch.bat" AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\lua.tag" Outputs=".libs\lua.tag"
/> />
@ -1592,7 +1736,7 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*&#x0D;&#x0A;" CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag"
AdditionalDependencies="7z.exe;un7z_and_touch.bat" AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\lua.tag" Outputs=".libs\lua.tag"
/> />