updates to wx to move class declarations out of wxmain.cpp and into wxmain.h; along with primative additon of Hud font setter
This commit is contained in:
dormito
parent
95c40ea60a
commit
5d68b4d98e
|
|
@ -111,195 +111,6 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="$(SolutionDir)\__bins"
|
||||
IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
WholeProgramOptimization="1"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
CommandLine=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="MASM"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
EnableFiberSafeOptimizations="true"
|
||||
WholeProgramOptimization="true"
|
||||
AdditionalIncludeDirectories=".;..;..\windows\lua\include;"..\windows\glib-2.20.1\build";"..\windows\glib-2.20.1\build\glib";..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows;..\windows\sdl\include;..\wxdlg"
|
||||
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;WXPORT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
StructMemberAlignment="0"
|
||||
BufferSecurityCheck="false"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
FloatingPointModel="2"
|
||||
WarningLevel="1"
|
||||
DebugInformationFormat="3"
|
||||
CallingConvention="0"
|
||||
CompileAs="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
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"
|
||||
AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs;.libs\win32"
|
||||
DelayLoadDLLs="lua51.dll"
|
||||
GenerateDebugInformation="true"
|
||||
OptimizeReferences="2"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
Profile="false"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
AdditionalManifestFiles="DeSmuME_x86.manifest"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Dev+|Win32"
|
||||
OutputDirectory="$(SolutionDir)\__bins"
|
||||
IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
WholeProgramOptimization="0"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
CommandLine=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="MASM"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="3"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
EnableFiberSafeOptimizations="true"
|
||||
WholeProgramOptimization="false"
|
||||
AdditionalIncludeDirectories=".;..;..\windows\lua\include;"..\windows\glib-2.20.1\build";"..\windows\glib-2.20.1\build\glib";..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows;..\windows\sdl\include;..\wxdlg"
|
||||
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;FASTBUILD;DEVELOPER;EXPERIMENTAL_WIFI_COMM;WXPORT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
StructMemberAlignment="0"
|
||||
BufferSecurityCheck="false"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
FloatingPointModel="2"
|
||||
WarningLevel="1"
|
||||
DebugInformationFormat="3"
|
||||
CallingConvention="0"
|
||||
CompileAs="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
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"
|
||||
AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs;.libs\win32"
|
||||
DelayLoadDLLs="lua51.dll"
|
||||
GenerateDebugInformation="true"
|
||||
OptimizeReferences="2"
|
||||
LinkTimeCodeGeneration="0"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
Profile="false"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
AdditionalManifestFiles="DeSmuME_x86.manifest"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="$(SolutionDir)\__bins"
|
||||
|
|
@ -391,6 +202,100 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="$(SolutionDir)\__bins"
|
||||
IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
WholeProgramOptimization="1"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
CommandLine=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="MASM"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
EnableFiberSafeOptimizations="true"
|
||||
WholeProgramOptimization="true"
|
||||
AdditionalIncludeDirectories=".;..;..\windows\lua\include;"..\windows\glib-2.20.1\build";"..\windows\glib-2.20.1\build\glib";..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows;..\windows\sdl\include;..\wxdlg"
|
||||
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;WXPORT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
StructMemberAlignment="0"
|
||||
BufferSecurityCheck="false"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
FloatingPointModel="2"
|
||||
WarningLevel="1"
|
||||
DebugInformationFormat="3"
|
||||
CallingConvention="0"
|
||||
CompileAs="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
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"
|
||||
AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs;.libs\win32"
|
||||
DelayLoadDLLs="lua51.dll"
|
||||
GenerateDebugInformation="true"
|
||||
OptimizeReferences="2"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
Profile="false"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
AdditionalManifestFiles="DeSmuME_x86.manifest"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="$(SolutionDir)\__bins"
|
||||
|
|
@ -486,6 +391,101 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Dev+|Win32"
|
||||
OutputDirectory="$(SolutionDir)\__bins"
|
||||
IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
WholeProgramOptimization="0"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
CommandLine=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="MASM"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="3"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
EnableFiberSafeOptimizations="true"
|
||||
WholeProgramOptimization="false"
|
||||
AdditionalIncludeDirectories=".;..;..\windows\lua\include;"..\windows\glib-2.20.1\build";"..\windows\glib-2.20.1\build\glib";..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows;..\windows\sdl\include;..\wxdlg"
|
||||
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;FASTBUILD;DEVELOPER;EXPERIMENTAL_WIFI_COMM;WXPORT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
StructMemberAlignment="0"
|
||||
BufferSecurityCheck="false"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
FloatingPointModel="2"
|
||||
WarningLevel="1"
|
||||
DebugInformationFormat="3"
|
||||
CallingConvention="0"
|
||||
CompileAs="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
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"
|
||||
AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs;.libs\win32"
|
||||
DelayLoadDLLs="lua51.dll"
|
||||
GenerateDebugInformation="true"
|
||||
OptimizeReferences="2"
|
||||
LinkTimeCodeGeneration="0"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
Profile="false"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
AdditionalManifestFiles="DeSmuME_x86.manifest"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Dev+|x64"
|
||||
OutputDirectory="$(SolutionDir)\__bins"
|
||||
|
|
@ -649,7 +649,7 @@
|
|||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|Win32"
|
||||
Name="Release|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
|
|
@ -657,7 +657,7 @@
|
|||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
Name="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
|
|
@ -1438,6 +1438,10 @@
|
|||
RelativePath=".\wxMain.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\wxMain.h"
|
||||
>
|
||||
</File>
|
||||
<Filter
|
||||
Name="PadSimple"
|
||||
>
|
||||
|
|
@ -1519,26 +1523,6 @@
|
|||
Outputs=".libs\7z.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\7z.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\7z.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
>
|
||||
|
|
@ -1549,6 +1533,16 @@
|
|||
Outputs=".libs\7z.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\7z.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
>
|
||||
|
|
@ -1559,12 +1553,22 @@
|
|||
Outputs=".libs\7z.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\7z.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*"
|
||||
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\7z.tag"
|
||||
/>
|
||||
|
|
@ -1593,26 +1597,6 @@
|
|||
Outputs=".libs\directx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\directx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\directx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
>
|
||||
|
|
@ -1623,6 +1607,16 @@
|
|||
Outputs=".libs\directx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\directx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
>
|
||||
|
|
@ -1633,6 +1627,16 @@
|
|||
Outputs=".libs\directx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\directx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release FastBuild|x64"
|
||||
>
|
||||
|
|
@ -1657,26 +1661,6 @@
|
|||
Outputs=".libs\glib-vc8.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\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="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\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="Debug|x64"
|
||||
>
|
||||
|
|
@ -1687,6 +1671,16 @@
|
|||
Outputs=".libs\glib-vc8.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\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"
|
||||
>
|
||||
|
|
@ -1697,6 +1691,16 @@
|
|||
Outputs=".libs\glib-vc8.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\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 FastBuild|x64"
|
||||
>
|
||||
|
|
@ -1716,27 +1720,7 @@
|
|||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
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"
|
||||
Outputs=".libs\lua.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
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"
|
||||
Outputs=".libs\lua.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag"
|
||||
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"
|
||||
Outputs=".libs\lua.tag"
|
||||
/>
|
||||
|
|
@ -1751,6 +1735,16 @@
|
|||
Outputs=".libs\lua.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
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"
|
||||
Outputs=".libs\lua.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
>
|
||||
|
|
@ -1761,6 +1755,16 @@
|
|||
Outputs=".libs\lua.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
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"
|
||||
Outputs=".libs\lua.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release FastBuild|x64"
|
||||
>
|
||||
|
|
@ -1796,21 +1800,21 @@
|
|||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|Win32"
|
||||
Name="Release|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\sdl\sdl.7z .libs\sdl*
"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\sdl\SDL7z .libs\sdl*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\sdl.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
Name="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\sdl\SDL7z .libs\sdl*"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\sdl\sdl.7z .libs\sdl*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\sdl.tag"
|
||||
/>
|
||||
|
|
@ -1829,26 +1833,6 @@
|
|||
Outputs=".libs\wx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\wx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\wx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
>
|
||||
|
|
@ -1859,6 +1843,16 @@
|
|||
Outputs=".libs\wx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\wx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
>
|
||||
|
|
@ -1869,6 +1863,16 @@
|
|||
Outputs=".libs\wx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Dev+|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*
"
|
||||
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
|
||||
Outputs=".libs\wx.tag"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release FastBuild|x64"
|
||||
>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,173 @@
|
|||
|
||||
#include "NDSSystem.h"
|
||||
#include <wx/wxprec.h>
|
||||
#include "movie.h"
|
||||
#include <wx/docview.h>
|
||||
#include <wx/config.h>
|
||||
static int nds_screen_rotation_angle;
|
||||
static wxFileConfig *desmumeConfig;
|
||||
enum
|
||||
{
|
||||
wPause = 1,
|
||||
wReset,
|
||||
wFrameCounter,
|
||||
wFPS,
|
||||
wDisplayInput,
|
||||
wDisplayGraphicalInput,
|
||||
wDisplayLagCounter,
|
||||
wDisplayMicrophone,
|
||||
wSetHUDFont,
|
||||
wMainGPU,
|
||||
wMainBG0,
|
||||
wMainBG1,
|
||||
wMainBG2,
|
||||
wMainBG3,
|
||||
wSubGPU,
|
||||
wSubBG0,
|
||||
wSubBG1,
|
||||
wSubBG2,
|
||||
wSubBG3,
|
||||
wWebsite,
|
||||
wForums,
|
||||
wSubmitABugReport,
|
||||
w3dView,
|
||||
wSaveStateAs,
|
||||
wLoadStateFrom,
|
||||
wCloseRom,
|
||||
wImportBackupMemory,
|
||||
wExportBackupMemory,
|
||||
wPlayMovie,
|
||||
wRecordMovie,
|
||||
wStopMovie,
|
||||
wSaveScreenshotAs,
|
||||
wQuickScreenshot,
|
||||
wLuaWindow,
|
||||
wConfigureControls,
|
||||
wRot0,
|
||||
wRot90,
|
||||
wRot180,
|
||||
wRot270,
|
||||
/* stupid enums: these two should be the at the end */
|
||||
wLoadState01,
|
||||
wSaveState01 = wLoadState01+20
|
||||
};
|
||||
|
||||
class Desmume: public wxApp
|
||||
{
|
||||
public:
|
||||
virtual bool OnInit();
|
||||
};
|
||||
|
||||
class DesmumeFrame: public wxFrame
|
||||
{
|
||||
public:
|
||||
DesmumeFrame(const wxString& title);
|
||||
~DesmumeFrame() {delete history;}
|
||||
void OnQuit(wxCommandEvent& WXUNUSED(event));
|
||||
void OnAbout(wxCommandEvent& WXUNUSED(event));
|
||||
void applyInput();
|
||||
//TODO integrate paths system?
|
||||
void LoadRom(wxCommandEvent& event);
|
||||
//----------------------------------------------------------------------------
|
||||
// Touchscreen
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
// De-transform coordinates.
|
||||
// Returns true if the coordinates are within the touchscreen.
|
||||
bool DetransformTouchCoords(int& X, int& Y);
|
||||
void OnTouchEvent(wxMouseEvent& evt);
|
||||
//----------------------------------------------------------------------------
|
||||
// Video
|
||||
//----------------------------------------------------------------------------
|
||||
void gpu_screen_to_rgb(u8 *rgb1, u8 *rgb2);
|
||||
//TODO should integrate filter system
|
||||
void onPaint(wxPaintEvent &event);
|
||||
void onIdle(wxIdleEvent &event);
|
||||
void pause(wxCommandEvent& event);
|
||||
void reset(wxCommandEvent& event){NDS_Reset();}
|
||||
void frameCounter(wxCommandEvent& event);
|
||||
void FPS(wxCommandEvent& event);
|
||||
void displayInput(wxCommandEvent& event);
|
||||
void displayGraphicalInput(wxCommandEvent& event);
|
||||
void displayLagCounter(wxCommandEvent& event);
|
||||
void displayMicrophone(wxCommandEvent& event);
|
||||
void setHUDFont(wxCommandEvent &event);
|
||||
|
||||
void mainG(int n);
|
||||
void subG(int n);
|
||||
|
||||
void mainGPU(wxCommandEvent& event){CommonSettings.showGpu.main^=true;}
|
||||
void mainBG0(wxCommandEvent& event){mainG(0);}
|
||||
void mainBG1(wxCommandEvent& event){mainG(1);}
|
||||
void mainBG2(wxCommandEvent& event){mainG(2);}
|
||||
void mainBG3(wxCommandEvent& event){mainG(3);}
|
||||
|
||||
void subGPU(wxCommandEvent& event){CommonSettings.showGpu.sub^=true;}
|
||||
void subBG0(wxCommandEvent& event){subG(0);}
|
||||
void subBG1(wxCommandEvent& event){subG(1);}
|
||||
void subBG2(wxCommandEvent& event){subG(2);}
|
||||
void subBG3(wxCommandEvent& event){subG(3);}
|
||||
|
||||
void website(wxCommandEvent& event) {wxLaunchDefaultBrowser(_T("http://desmume.org/"));}
|
||||
void forums(wxCommandEvent& event) {wxLaunchDefaultBrowser(_T("http://forums.desmume.org/index.php"));}
|
||||
void submitABugReport(wxCommandEvent& event) {wxLaunchDefaultBrowser(_T("http://sourceforge.net/tracker/?func=add&group_id=164579&atid=832291"));}
|
||||
|
||||
void _3dView(wxCommandEvent& event);
|
||||
void saveStateAs(wxCommandEvent& event);
|
||||
void loadStateFrom(wxCommandEvent& event);
|
||||
|
||||
void closeRom(wxCommandEvent& event);
|
||||
void importBackupMemory(wxCommandEvent& event);
|
||||
void exportBackupMemory(wxCommandEvent& event);
|
||||
void saveScreenshotAs(wxCommandEvent& event);
|
||||
void quickScreenshot(wxCommandEvent& event);
|
||||
//TODO
|
||||
void playMovie(wxCommandEvent& event) {}
|
||||
void recordMovie(wxCommandEvent& event) {}
|
||||
void stopMovie(wxCommandEvent& event) {FCEUI_StopMovie();}
|
||||
|
||||
void OnOpenLuaWindow(wxCommandEvent& WXUNUSED (event));
|
||||
void OnOpenControllerConfiguration(wxCommandEvent& WXUNUSED (event));
|
||||
wxMenu* MakeStatesSubMenu( int baseid ) const
|
||||
{
|
||||
wxMenu* mnuSubstates = new wxMenu();
|
||||
|
||||
for (int i = 0; i < 10; i++)
|
||||
{
|
||||
mnuSubstates->Append( baseid+i, wxString::Format(_T("Slot %d"), i) );
|
||||
}
|
||||
return mnuSubstates;
|
||||
}
|
||||
void Menu_SaveStates(wxCommandEvent &event);
|
||||
void Menu_LoadStates(wxCommandEvent &event);
|
||||
void NDSInitialize();
|
||||
void OnRotation(wxCommandEvent &event);
|
||||
void ChangeRotation(int rot, bool skip);
|
||||
void onResize(wxSizeEvent &event);
|
||||
bool LoadSettings();
|
||||
bool SaveSettings();
|
||||
void OnClose(wxCloseEvent &event);
|
||||
void OnOpenRecent(wxCommandEvent &event);
|
||||
|
||||
private:
|
||||
void loadfileMenu(wxMenu *fileMenu);
|
||||
void loadmenuBar(wxMenuBar *menuBar);
|
||||
void loadhelpMenu(wxMenu *helpMenu);
|
||||
void loadconfigMenu(wxMenu *configMenu);
|
||||
void loadtoolsMenu(wxMenu *toolsMenu);
|
||||
void loadlayersMenu(wxMenu *layersMenu);
|
||||
void loadviewMenu(wxMenu *viewMenu);
|
||||
void loadrotateMenu(wxMenu *rotateMenu);
|
||||
void loademulationMenu(wxMenu *emulationMenu);
|
||||
struct NDS_fw_config_data fw_config;
|
||||
wxFileHistory* history;
|
||||
#ifdef GDB_STUB
|
||||
gdbstub_handle_t arm9_gdb_stub;
|
||||
gdbstub_handle_t arm7_gdb_stub;
|
||||
struct armcpu_memory_iface *arm9_memio;
|
||||
struct armcpu_memory_iface *arm7_memio;
|
||||
struct armcpu_ctrl_iface *arm9_ctrl_iface;
|
||||
struct armcpu_ctrl_iface *arm7_ctrl_iface;
|
||||
#endif
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
Loading…
Reference in New Issue