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

add wx dialog to gtk port as demonstration, but you can't see it because i can't figure out how to add a gtk menu item. anyway, my work here is done: concept proved.

This commit is contained in:
zeromus 2009-12-15 03:47:22 +00:00
parent fcf244747d
commit 32e64e3e51
10 changed files with 426 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/configure.ac
View File

@ -208,6 +208,8 @@ if test "x$wxwidget" = "xyes" ; then
fi fi
fi fi
AM_CONDITIONAL([HAVE_WX], [test "x$wxwidget" = "xyes"])
dnl - Determine which UIs to build and if po/ should be included dnl - Determine which UIs to build and if po/ should be included
PO_DIR="" PO_DIR=""
if test "x$HAVE_SDL" = "xyes"; then if test "x$HAVE_SDL" = "xyes"; then

3
desmume/src/Makefile.am
View File

@ -54,6 +54,9 @@ libdesmume_a_SOURCES = \
metaspu/metaspu.cpp metaspu/metaspu.h \ metaspu/metaspu.cpp metaspu/metaspu.h \
version.cpp version.h version.cpp version.h
if HAVE_WX
libdesmume_a_SOURCES += wxdlg/wxdlg3dViewer.cpp
endif
if HAVE_ALSA if HAVE_ALSA
libdesmume_a_SOURCES += mic_alsa.cpp libdesmume_a_SOURCES += mic_alsa.cpp
else else

7
desmume/src/driver.cpp
View File

@ -25,11 +25,12 @@
#include "gfx3d.h" #include "gfx3d.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#define USE_WX #define HAVE_WX
#endif #endif
#ifdef USE_WX #ifdef HAVE_WX
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/wx.h"
#include "wxdlg/wxdlg3dViewer.h" #include "wxdlg/wxdlg3dViewer.h"
const int kVewportWidth = 512; const int kVewportWidth = 512;
@ -159,7 +160,7 @@ void BaseDriver::VIEW3D_Shutdown()
void BaseDriver::VIEW3D_Init() void BaseDriver::VIEW3D_Init()
{ {
VIEW3D_Shutdown(); VIEW3D_Shutdown();
#ifdef USE_WX #ifdef HAVE_WX
view3d = new VIEW3D_Driver_WX(); view3d = new VIEW3D_Driver_WX();
#endif #endif
} }

38
desmume/src/gtk/main.cpp
View File

@ -57,6 +57,25 @@
#include "gdbstub.h" #include "gdbstub.h"
#endif #endif
#ifdef HAVE_WX
#include "wx/wx.h"
class wxDesmumeApp : public wxApp
{
public:
//call me each frame or something.
//sort of an idle routine
static void frameUpdate()
{
if(!wxTheApp) return;
wxDesmumeApp* self = ((wxDesmumeApp*)wxTheApp);
self->DeletePendingObjects();
}
};
IMPLEMENT_APP_NO_MAIN( wxDesmumeApp )
#endif
#ifdef HAVE_LIBOSMESA #ifdef HAVE_LIBOSMESA
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
@ -108,6 +127,7 @@ static void LoadStateDialog();
void Launch(); void Launch();
void Pause(); void Pause();
static void Printscreen(); static void Printscreen();
static void View3d();
static void Reset(); static void Reset();
static void Edit_Controls(); static void Edit_Controls();
static void MenuSave(GtkMenuItem *item, gpointer slot); static void MenuSave(GtkMenuItem *item, gpointer slot);
@ -276,6 +296,10 @@ static const GtkActionEntry action_entries[] = {
{ "run", "gtk-media-play", "_Run", "<Ctrl>r", NULL, Launch }, { "run", "gtk-media-play", "_Run", "<Ctrl>r", NULL, Launch },
{ "pause", "gtk-media-pause", "_Pause", "<Ctrl>p", NULL, Pause }, { "pause", "gtk-media-pause", "_Pause", "<Ctrl>p", NULL, Pause },
{ "reset", "gtk-refresh", "Re_set", NULL, NULL, Reset }, { "reset", "gtk-refresh", "Re_set", NULL, NULL, Reset },
#ifdef HAVE_WX
//for some reason the menu item doesnt show up....
{ "view3d", NULL, "View 3d", NULL, NULL, View3d },
#endif
{ "FrameskipMenu", NULL, "_Frameskip" }, { "FrameskipMenu", NULL, "_Frameskip" },
{ "LayersMenu", NULL, "_Layers" }, { "LayersMenu", NULL, "_Layers" },
{ "CheatMenu", NULL, "_Cheat" }, { "CheatMenu", NULL, "_Cheat" },
@ -953,6 +977,12 @@ static void OpenRecent(GtkRecentChooser *chooser, gpointer user_data)
} }
#endif #endif
static void View3d()
{
driver->VIEW3D_Init();
driver->view3d->Launch();
}
static void Reset() static void Reset()
{ {
NDS_Reset(); NDS_Reset();
@ -1619,6 +1649,10 @@ gboolean EmuLoop(gpointer data)
} }
} }
#ifdef HAVE_WX
wxDesmumeApp::frameUpdate();
#endif
return TRUE; return TRUE;
} }
@ -2079,6 +2113,10 @@ int main (int argc, char *argv[])
exit(0); exit(0);
} }
#ifdef HAVE_WX
wxInitialize();
#endif
return common_gtk_main( &my_config); return common_gtk_main( &my_config);
} }

2
desmume/src/version.h
View File

@ -23,4 +23,4 @@
u32 EMU_DESMUME_VERSION_NUMERIC(); u32 EMU_DESMUME_VERSION_NUMERIC();
const char* EMU_DESMUME_VERSION_STRING(); const char* EMU_DESMUME_VERSION_STRING();
const char* EMU_DESMUME_NAME_AND_VERSION(); const char* EMU_DESMUME_NAME_AND_VERSION();
const char* EMU_DESMUME_COMPILER_DETAIL(); const char* EMU_DESMUME_COMPILER_DETAIL();

654
desmume/src/windows/DeSmuME_2005.vcproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="shift_jis"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
@ -115,205 +115,6 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\__bins"
IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="defaultconfig\SubWCRev.bat"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;NDEBUG;RELEASE;_WIN32_WINNT=0x0501"
StringPooling="true"
ExceptionHandling="1"
BasicRuntimeChecks="0"
StructMemberAlignment="0"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="2"
RuntimeTypeInfo="false"
WarningLevel="1"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="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 winpcap\wpcap.lib Rpcrt4.lib"
OutputFile="$(OutDir)\$(ProjectName)_release.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs"
DelayLoadDLLs="wpcap.dll"
GenerateDebugInformation="true"
GenerateMapFile="true"
EnableCOMDATFolding="0"
OptimizeForWindows98="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="DeSmuME_x86.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release FastBuild|Win32"
OutputDirectory="$(SolutionDir)\__bins"
IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="defaultconfig\SubWCRev.bat"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;NDEBUG;RELEASE;_WIN32_WINNT=0x0501;FASTBUILD"
StringPooling="true"
ExceptionHandling="1"
BasicRuntimeChecks="0"
StructMemberAlignment="0"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="2"
RuntimeTypeInfo="false"
WarningLevel="3"
WarnAsError="false"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="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 winpcap\wpcap.lib Rpcrt4.lib"
OutputFile="$(OutDir)\$(ProjectName)_releaseFastBuild.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs"
DelayLoadDLLs="wpcap.dll"
GenerateDebugInformation="true"
GenerateMapFile="true"
OptimizeReferences="2"
EnableCOMDATFolding="0"
OptimizeForWindows98="1"
LinkTimeCodeGeneration="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="DeSmuME_x86.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
OutputDirectory="$(SolutionDir)\__bins" OutputDirectory="$(SolutionDir)\__bins"
@ -408,6 +209,104 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\__bins"
IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="defaultconfig\SubWCRev.bat"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;NDEBUG;RELEASE;_WIN32_WINNT=0x0501"
StringPooling="true"
ExceptionHandling="1"
BasicRuntimeChecks="0"
StructMemberAlignment="0"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="2"
RuntimeTypeInfo="false"
WarningLevel="1"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="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 winpcap\wpcap.lib Rpcrt4.lib"
OutputFile="$(OutDir)\$(ProjectName)_release.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs"
DelayLoadDLLs="wpcap.dll"
GenerateDebugInformation="true"
GenerateMapFile="true"
EnableCOMDATFolding="0"
OptimizeForWindows98="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="DeSmuME_x86.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(SolutionDir)\__bins" OutputDirectory="$(SolutionDir)\__bins"
@ -508,6 +407,107 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release FastBuild|Win32"
OutputDirectory="$(SolutionDir)\__bins"
IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="defaultconfig\SubWCRev.bat"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;NDEBUG;RELEASE;_WIN32_WINNT=0x0501;FASTBUILD"
StringPooling="true"
ExceptionHandling="1"
BasicRuntimeChecks="0"
StructMemberAlignment="0"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="2"
RuntimeTypeInfo="false"
WarningLevel="3"
WarnAsError="false"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="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 comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib winpcap\wpcap.lib Rpcrt4.lib"
OutputFile="$(OutDir)\$(ProjectName)_releaseFastBuild.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs"
DelayLoadDLLs="wpcap.dll"
GenerateDebugInformation="true"
GenerateMapFile="true"
OptimizeReferences="2"
EnableCOMDATFolding="0"
OptimizeForWindows98="1"
LinkTimeCodeGeneration="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="DeSmuME_x86.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release FastBuild|x64" Name="Release FastBuild|x64"
OutputDirectory="$(SolutionDir)\__bins" OutputDirectory="$(SolutionDir)\__bins"
@ -962,6 +962,16 @@
Outputs=".libs\7z.tag" Outputs=".libs\7z.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
> >
@ -972,6 +982,16 @@
Outputs=".libs\7z.tag" Outputs=".libs\7z.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|Win32" Name="Release FastBuild|Win32"
> >
@ -982,32 +1002,12 @@
Outputs=".libs\7z.tag" Outputs=".libs\7z.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|x64" Name="Release FastBuild|x64"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*" CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat" AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag" Outputs=".libs\7z.tag"
/> />
@ -1026,6 +1026,16 @@
Outputs=".libs\directx.tag" Outputs=".libs\directx.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat directx\directx.7z .libs\directx*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\directx.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
> >
@ -1036,6 +1046,16 @@
Outputs=".libs\directx.tag" Outputs=".libs\directx.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat directx\directx.7z .libs\directx*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\directx.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|Win32" Name="Release FastBuild|Win32"
> >
@ -1046,32 +1066,12 @@
Outputs=".libs\directx.tag" Outputs=".libs\directx.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat directx\directx.7z .libs\directx*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\directx.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat directx\directx.7z .libs\directx*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\directx.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|x64" Name="Release FastBuild|x64"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat directx\directx.7z .libs\directx*" CommandLine="un7z_and_touch.bat directx\directx.7z .libs\directx*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat" AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\directx.tag" Outputs=".libs\directx.tag"
/> />
@ -1090,6 +1090,16 @@
Outputs=".libs\glib-vc8.tag" Outputs=".libs\glib-vc8.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\glib-vc8.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
> >
@ -1100,6 +1110,16 @@
Outputs=".libs\glib-vc8.tag" Outputs=".libs\glib-vc8.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\glib-vc8.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|Win32" Name="Release FastBuild|Win32"
> >
@ -1110,32 +1130,12 @@
Outputs=".libs\glib-vc8.tag" Outputs=".libs\glib-vc8.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\glib-vc8.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\glib-vc8.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|x64" Name="Release FastBuild|x64"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*" CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat" AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\glib-vc8.tag" Outputs=".libs\glib-vc8.tag"
/> />
@ -1154,6 +1154,16 @@
Outputs=".libs\lua.tag" Outputs=".libs\lua.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat lua\lua.7z .libs\lua*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\lua.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
> >
@ -1164,6 +1174,16 @@
Outputs=".libs\lua.tag" Outputs=".libs\lua.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat lua\lua.7z .libs\lua*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\lua.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|Win32" Name="Release FastBuild|Win32"
> >
@ -1174,32 +1194,12 @@
Outputs=".libs\lua.tag" Outputs=".libs\lua.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat lua\lua.7z .libs\lua*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\lua.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat lua\lua.7z .libs\lua*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\lua.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|x64" Name="Release FastBuild|x64"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat lua\lua.7z .libs\lua*" CommandLine="un7z_and_touch.bat lua\lua.7z .libs\lua*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat" AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\lua.tag" Outputs=".libs\lua.tag"
/> />
@ -1218,6 +1218,16 @@
Outputs=".libs\wx.tag" Outputs=".libs\wx.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat wx\wx.7z .libs\wx*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\wx.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
> >
@ -1228,6 +1238,16 @@
Outputs=".libs\wx.tag" Outputs=".libs\wx.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat wx\wx.7z .libs\wx*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\wx.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|Win32" Name="Release FastBuild|Win32"
> >
@ -1238,32 +1258,12 @@
Outputs=".libs\wx.tag" Outputs=".libs\wx.tag"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat wx\wx.7z .libs\wx*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\wx.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat wx\wx.7z .libs\wx*"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\wx.tag"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|x64" Name="Release FastBuild|x64"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat wx\wx.7z .libs\wx*" CommandLine="un7z_and_touch.bat wx\wx.7z .libs\wx*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat" AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\wx.tag" Outputs=".libs\wx.tag"
/> />
@ -1341,24 +1341,6 @@
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release FastBuild|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|x64" Name="Debug|x64"
> >
@ -1368,6 +1350,15 @@
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Release|x64"
> >
@ -1377,6 +1368,15 @@
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release FastBuild|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|x64" Name="Release FastBuild|x64"
> >
@ -1564,6 +1564,10 @@
RelativePath="..\wxdlg\wxdlg3dViewer.h" RelativePath="..\wxdlg\wxdlg3dViewer.h"
> >
</File> </File>
<File
RelativePath="..\wxdlg\wxMain.cpp"
>
</File>
</Filter> </Filter>
<File <File
RelativePath="..\addons.cpp" RelativePath="..\addons.cpp"
@ -1661,7 +1665,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release FastBuild|Win32" Name="Release|x64"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
@ -1669,7 +1673,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Release FastBuild|Win32"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"

92
desmume/src/windows/main.cpp
View File

@ -108,10 +108,6 @@ using namespace std;
VideoInfo video; VideoInfo video;
#define WX_STUB
#ifdef WX_STUB
#include "wx/wxprec.h" #include "wx/wxprec.h"
#ifdef _M_X64 #ifdef _M_X64
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
@ -133,20 +129,20 @@ VideoInfo video;
#pragma comment(lib,"comctl32.lib") #pragma comment(lib,"comctl32.lib")
#include "../wxdlg/wxdlg3dViewer.h" #include "../wxdlg/wxdlg3dViewer.h"
class wxDesmumeApp : public wxApp //class wxDesmumeApp : public wxApp
{ //{
public: //public:
//call me each frame or something. // //call me each frame or something.
//sort of an idle routine // //sort of an idle routine
static void frameUpdate() // static void frameUpdate()
{ // {
if(!wxTheApp) return; // if(!wxTheApp) return;
wxDesmumeApp* self = ((wxDesmumeApp*)wxTheApp); // wxDesmumeApp* self = ((wxDesmumeApp*)wxTheApp);
self->DeletePendingObjects(); // self->DeletePendingObjects();
} // }
}; //};
IMPLEMENT_APP_NO_MAIN( wxDesmumeApp ) //IMPLEMENT_APP_NO_MAIN( wxDesmumeApp )
void wxTest() { void wxTest() {
//wxdlg3dViewer *viewer = new wxdlg3dViewer(NULL); //wxdlg3dViewer *viewer = new wxdlg3dViewer(NULL);
@ -155,8 +151,6 @@ void wxTest() {
//frame->Show(true); //frame->Show(true);
} }
#endif
#ifndef PUBLIC_RELEASE #ifndef PUBLIC_RELEASE
#define DEVELOPER_MENU_ITEMS #define DEVELOPER_MENU_ITEMS
#endif #endif
@ -2643,36 +2637,36 @@ int _main()
return 0; return 0;
} }
int WINAPI WinMain (HINSTANCE hThisInstance, //int WINAPI WinMain (HINSTANCE hThisInstance,
HINSTANCE hPrevInstance, // HINSTANCE hPrevInstance,
LPSTR lpszArgument, // LPSTR lpszArgument,
int nFunsterStil) // int nFunsterStil)
//
{ //{
TIMECAPS tc; // TIMECAPS tc;
if (timeGetDevCaps(&tc, sizeof(TIMECAPS))== TIMERR_NOERROR) // if (timeGetDevCaps(&tc, sizeof(TIMECAPS))== TIMERR_NOERROR)
{ // {
wmTimerRes = std::min(std::max(tc.wPeriodMin, (UINT)1), tc.wPeriodMax); // wmTimerRes = std::min(std::max(tc.wPeriodMin, (UINT)1), tc.wPeriodMax);
timeBeginPeriod (wmTimerRes); // timeBeginPeriod (wmTimerRes);
} // }
else // else
{ // {
wmTimerRes = 5; // wmTimerRes = 5;
timeBeginPeriod (wmTimerRes); // timeBeginPeriod (wmTimerRes);
} // }
//
g_thread_init (NULL); // g_thread_init (NULL);
hAppInst=hThisInstance; // hAppInst=hThisInstance;
OpenConsole(); // Init debug console // OpenConsole(); // Init debug console
//
int ret = _main(); // int ret = _main();
//
timeEndPeriod (wmTimerRes); // timeEndPeriod (wmTimerRes);
//
CloseConsole(); // CloseConsole();
//
return ret; // return ret;
} //}
void UpdateWndRects(HWND hwnd) void UpdateWndRects(HWND hwnd)
{ {

2
desmume/src/wxdlg/desmume.pjd
View File

@ -333,7 +333,7 @@
<string name="proxy-type">"wbStaticBoxSizerProxy"</string> <string name="proxy-type">"wbStaticBoxSizerProxy"</string>
<string name="proxy-Id name">"wxID_ANY"</string> <string name="proxy-Id name">"wxID_ANY"</string>
<long name="proxy-Id value">-1</long> <long name="proxy-Id value">-1</long>
<string name="proxy-Label">"Display options"</string> <string name="proxy-Label">"Display optionsss"</string>
<string name="proxy-Member variable name">""</string> <string name="proxy-Member variable name">""</string>
<string name="proxy-Sizer member variable name">""</string> <string name="proxy-Sizer member variable name">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>

4
desmume/src/wxdlg/wxdlg3dViewer.cpp
View File

@ -123,7 +123,7 @@ void wxdlg3dViewer::Init()
void wxdlg3dViewer::CreateControls() void wxdlg3dViewer::CreateControls()
{ {
////@begin wxdlg3dViewer content construction ////@begin wxdlg3dViewer content construction
// Generated by DialogBlocks, 14/12/2009 00:57:31 (unregistered) // Generated by DialogBlocks, 14/12/2009 20:51:53 (unregistered)
wxdlg3dViewer* itemDialog1 = this; wxdlg3dViewer* itemDialog1 = this;
@ -135,7 +135,7 @@ void wxdlg3dViewer::CreateControls()
itemFlexGridSizer2->AddGrowableCol(4); itemFlexGridSizer2->AddGrowableCol(4);
itemDialog1->SetSizer(itemFlexGridSizer2); itemDialog1->SetSizer(itemFlexGridSizer2);
wxStaticBox* itemStaticBoxSizer3Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Display options")); wxStaticBox* itemStaticBoxSizer3Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Display optionsss"));
wxStaticBoxSizer* itemStaticBoxSizer3 = new wxStaticBoxSizer(itemStaticBoxSizer3Static, wxVERTICAL); wxStaticBoxSizer* itemStaticBoxSizer3 = new wxStaticBoxSizer(itemStaticBoxSizer3Static, wxVERTICAL);
itemFlexGridSizer2->Add(itemStaticBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemFlexGridSizer2->Add(itemStaticBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);

6
desmume/src/wxdlg/wxdlg3dViewer.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: x.h // Name: wxdlg3dviewer.h
// Purpose: // Purpose:
// Author: // Author:
// Modified by: // Modified by:
@ -11,8 +11,8 @@
// Generated by DialogBlocks (unregistered), 12/12/2009 15:45:31 // Generated by DialogBlocks (unregistered), 12/12/2009 15:45:31
#ifndef _X_H_ #ifndef _WXDLG3DVIEWER_H_
#define _X_H_ #define _WXDLG3DVIEWER_H_
/*! /*!