From: <ze...@us...> - 2010-02-04 06:23:02
|
Revision: 3371 http://desmume.svn.sourceforge.net/desmume/?rev=3371&view=rev Author: zeromus Date: 2010-02-04 06:22:54 +0000 (Thu, 04 Feb 2010) Log Message: ----------- wx port vcproj Modified Paths: -------------- trunk/desmume/src/GPU_osd.cpp trunk/desmume/src/NDSSystem.h trunk/desmume/src/OGLRender.cpp trunk/desmume/src/lua-engine.cpp trunk/desmume/src/path.h trunk/desmume/src/version.cpp trunk/desmume/src/wifi.cpp trunk/desmume/src/windows/DeSmuME_2005.vcproj trunk/desmume/src/windows/config.h trunk/desmume/src/wx/IniFile.cpp trunk/desmume/src/wx/InputCommon/DirectInputBase.h trunk/desmume/src/wx/InputCommon/EventHandler.cpp trunk/desmume/src/wx/InputCommon/EventHandler.h trunk/desmume/src/wx/PadSimple/PadSimple.cpp trunk/desmume/src/wx/wxMain.cpp Added Paths: ----------- trunk/desmume/src/wx/7z.dll trunk/desmume/src/wx/7z.exe trunk/desmume/src/wx/DeSmuME_x64.manifest trunk/desmume/src/wx/DeSmuME_x86.manifest trunk/desmume/src/wx/touch.exe trunk/desmume/src/wx/un7z_and_touch.bat trunk/desmume/src/wx/wxDeSmuME_2008.sln trunk/desmume/src/wx/wxDeSmuME_2008.vcproj Modified: trunk/desmume/src/GPU_osd.cpp =================================================================== --- trunk/desmume/src/GPU_osd.cpp 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/GPU_osd.cpp 2010-02-04 06:22:54 UTC (rev 3371) @@ -550,7 +550,7 @@ drawPad(Hud.GraphicalInputDisplay.x, Hud.GraphicalInputDisplay.y, 2.5); } - #ifdef WIN32 + #if defined(WIN32) && !defined(WXPORT) if (CommonSettings.hud.ShowMicrophone) { osd->addFixed(Hud.Microphone.x, Hud.Microphone.y, "%03d [%07d]",MicDisplay, Hud.cpuloopIterationCount); Modified: trunk/desmume/src/NDSSystem.h =================================================================== --- trunk/desmume/src/NDSSystem.h 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/NDSSystem.h 2010-02-04 06:22:54 UTC (rev 3371) @@ -33,7 +33,7 @@ #include <string> -#ifdef WIN32 +#if defined(WIN32) && !defined(WXPORT) #include "pathsettings.h" #endif Modified: trunk/desmume/src/OGLRender.cpp =================================================================== --- trunk/desmume/src/OGLRender.cpp 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/OGLRender.cpp 2010-02-04 06:22:54 UTC (rev 3371) @@ -44,7 +44,7 @@ oglrender_endOpenGL(); } -#ifdef _WIN32 +#ifdef _WIN32 && !defined(WXPORT) #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <GL/gl.h> Modified: trunk/desmume/src/lua-engine.cpp =================================================================== --- trunk/desmume/src/lua-engine.cpp 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/lua-engine.cpp 2010-02-04 06:22:54 UTC (rev 3371) @@ -11,13 +11,15 @@ #include "GPU_osd.h" #include "saves.h" #include "emufile.h" -#ifdef WIN32 +#if defined(WIN32) && !defined(WXPORT) #include "main.h" #include "windows.h" #include "video.h" #endif +using namespace std; + // functions that maybe aren't part of the Lua engine // but didn't make sense to add to BaseDriver (at least not yet) static bool IsHardwareAddressValid(u32 address) { @@ -424,7 +426,7 @@ static const char * const titles [] = {"Notice", "Question", "Warning", "Error"}; const char* answer = "ok"; -#ifdef _WIN32 +#if defined(_WIN32) && !defined(WXPORT) static const int etypes [] = {MB_OK, MB_YESNO, MB_YESNOCANCEL, MB_OKCANCEL, MB_ABORTRETRYIGNORE}; static const int eicons [] = {MB_ICONINFORMATION, MB_ICONQUESTION, MB_ICONWARNING, MB_ICONERROR}; // DialogsOpen++; @@ -1274,7 +1276,7 @@ if (b != (UBits)1437217655L || BAD_SAR) { /* Perform a simple self-test. */ const char *msg = "compiled with incompatible luaconf.h"; #ifdef LUA_NUMBER_DOUBLE -#ifdef _WIN32 +#if defined(_WIN32) && !defined(WXPORT) if (b == (UBits)1610612736L) msg = "use D3DCREATE_FPU_PRESERVE with DirectX"; #endif @@ -1346,7 +1348,7 @@ lua_pop(L, 1); } */ -#ifdef _WIN32 +#if defined(_WIN32) && !defined(WXPORT) int uid = luaStateToUIDMap[L->l_G->mainthread]; HWND hDlg = (HWND)uid; char str [1024]; @@ -1400,7 +1402,7 @@ if(!info.panic) { SPU_ClearOutputBuffer(); -#if defined(ASK_USER_ON_FREEZE) && defined(_WIN32) +#if defined(ASK_USER_ON_FREEZE) && defined(_WIN32) && !defined(WXPORT) DialogsOpen++; int answer = MessageBox(HWnd, "A Lua script has been running for quite a while. Maybe it is in an infinite loop.\n\nWould you like to stop the script?\n\n(Yes to stop it now,\n No to keep running and not ask again,\n Cancel to keep running but ask again later)", "Lua Alert", MB_YESNOCANCEL | MB_DEFBUTTON3 | MB_ICONASTERISK); DialogsOpen--; @@ -2508,7 +2510,7 @@ } else { -#ifdef WIN32 +#if defined(WIN32) && !defined(WXPORT) extern VideoInfo video; curGuiData.data = video.buffer; curGuiData.stridePix = 256; @@ -3356,7 +3358,7 @@ DEFINE_LUA_FUNCTION(emu_openscript, "filename") { -#ifdef WIN32 +#if defined(WIN32) && !defined(WXPORT) char curScriptDir[1024]; GetCurrentScriptDir(curScriptDir, 1024); // make sure we can always find scripts that are in the same directory as the current script const char* filename = lua_isstring(L,1) ? lua_tostring(L,1) : NULL; extern const char* OpenLuaScript(const char* filename, const char* extraDirToCheck, bool makeSubservient); @@ -3536,7 +3538,7 @@ return 0; } -#ifdef _WIN32 +#if defined(_WIN32) && !defined(WXPORT) const char* s_keyToName[256] = { NULL, @@ -3650,7 +3652,7 @@ { lua_newtable(L); -#ifdef _WIN32 +#if defined(_WIN32) && !defined(WXPORT) // keyboard and mouse button status { int BackgroundInput = 0;//TODO Modified: trunk/desmume/src/path.h =================================================================== --- trunk/desmume/src/path.h 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/path.h 2010-02-04 06:22:54 UTC (rev 3371) @@ -1,6 +1,6 @@ #include <string> -#ifdef WIN32 +#if defined(WIN32) && !defined(WXPORT) #include "resource.h" #else #include <glib.h> @@ -312,7 +312,7 @@ enum ImageFormat { -#ifdef WIN32 +#if defined(WIN32) && !defined(WXPORT) PNG = IDC_PNG, BMP = IDC_BMP #else Modified: trunk/desmume/src/version.cpp =================================================================== --- trunk/desmume/src/version.cpp 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/version.cpp 2010-02-04 06:22:54 UTC (rev 3371) @@ -21,7 +21,7 @@ #include "version.h" //todo - everyone will want to support this eventually, i suppose -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(WXPORT) #include "svnrev.h" #else #ifdef SVN_REV Modified: trunk/desmume/src/wifi.cpp =================================================================== --- trunk/desmume/src/wifi.cpp 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/wifi.cpp 2010-02-04 06:22:54 UTC (rev 3371) @@ -32,7 +32,9 @@ #include <ws2tcpip.h> #define socket_t SOCKET #define sockaddr_t SOCKADDR - #include "windriver.h" + #ifndef WXPORT + #include "windriver.h" + #endif #else #include <unistd.h> #include <stdlib.h> Modified: trunk/desmume/src/windows/DeSmuME_2005.vcproj =================================================================== --- trunk/desmume/src/windows/DeSmuME_2005.vcproj 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/windows/DeSmuME_2005.vcproj 2010-02-04 06:22:54 UTC (rev 3371) @@ -48,6 +48,7 @@ /> <Tool Name="VCCLCompilerTool" + AdditionalOptions="/MP" Optimization="0" InlineFunctionExpansion="0" EnableIntrinsicFunctions="false" @@ -1576,6 +1577,14 @@ <File RelativePath="..\wxdlg\wxdlg3dViewer.cpp" > + <FileConfiguration + Name="Release FastBuild|Win32" + > + <Tool + Name="VCCLCompilerTool" + GeneratePreprocessedFile="1" + /> + </FileConfiguration> </File> <File RelativePath="..\wxdlg\wxdlg3dViewer.h" Modified: trunk/desmume/src/windows/config.h =================================================================== --- trunk/desmume/src/windows/config.h 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/windows/config.h 2010-02-04 06:22:54 UTC (rev 3371) @@ -1,6 +1,8 @@ #ifndef _CONFIG_H #define _CONFIG_H +#if !defined(WXPORT) #include "userconfig.h" +#endif #endif Added: trunk/desmume/src/wx/7z.dll =================================================================== (Binary files differ) Property changes on: trunk/desmume/src/wx/7z.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/desmume/src/wx/7z.exe =================================================================== (Binary files differ) Property changes on: trunk/desmume/src/wx/7z.exe ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/desmume/src/wx/DeSmuME_x64.manifest =================================================================== --- trunk/desmume/src/wx/DeSmuME_x64.manifest (rev 0) +++ trunk/desmume/src/wx/DeSmuME_x64.manifest 2010-02-04 06:22:54 UTC (rev 3371) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly + xmlns="urn:schemas-microsoft-com:asm.v1" + manifestVersion="1.0"> +<assemblyIdentity + name="DeSmuME" + processorArchitecture="amd64" + version="1.0.0.0" + type="win32"/> +<description>DeSmuME</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="amd64" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Added: trunk/desmume/src/wx/DeSmuME_x86.manifest =================================================================== --- trunk/desmume/src/wx/DeSmuME_x86.manifest (rev 0) +++ trunk/desmume/src/wx/DeSmuME_x86.manifest 2010-02-04 06:22:54 UTC (rev 3371) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly + xmlns="urn:schemas-microsoft-com:asm.v1" + manifestVersion="1.0"> +<assemblyIdentity + name="DeSmuME" + processorArchitecture="x86" + version="1.0.0.0" + type="win32"/> +<description>DeSmuME</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="x86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Modified: trunk/desmume/src/wx/IniFile.cpp =================================================================== --- trunk/desmume/src/wx/IniFile.cpp 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/wx/IniFile.cpp 2010-02-04 06:22:54 UTC (rev 3371) @@ -18,7 +18,7 @@ #include <stdlib.h> #include <stdio.h> -#include <strings.h> +#include <string.h> #include <string> #include <vector> Modified: trunk/desmume/src/wx/InputCommon/DirectInputBase.h =================================================================== --- trunk/desmume/src/wx/InputCommon/DirectInputBase.h 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/wx/InputCommon/DirectInputBase.h 2010-02-04 06:22:54 UTC (rev 3371) @@ -26,7 +26,7 @@ #include <stdio.h> #define DIRECTINPUT_VERSION 0x0800 // DirectInput -#include <dinput.h> +#include <directx/dinput.h> //#include "ConsoleWindow.h" // Common Modified: trunk/desmume/src/wx/InputCommon/EventHandler.cpp =================================================================== --- trunk/desmume/src/wx/InputCommon/EventHandler.cpp 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/wx/InputCommon/EventHandler.cpp 2010-02-04 06:22:54 UTC (rev 3371) @@ -2,7 +2,7 @@ #include <stdio.h> #include <ctype.h> -#if defined HAVE_WX && HAVE_WX +#if defined(HAVE_WX) #include <wx/wx.h> #endif @@ -98,7 +98,7 @@ return (false); } -#if defined HAVE_WX && HAVE_WX +#if defined(HAVE_WX) // Taken from wxw source code sf::Key::Code EventHandler::wxCharCodeToSF(int id) { Modified: trunk/desmume/src/wx/InputCommon/EventHandler.h =================================================================== --- trunk/desmume/src/wx/InputCommon/EventHandler.h 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/wx/InputCommon/EventHandler.h 2010-02-04 06:22:54 UTC (rev 3371) @@ -54,7 +54,7 @@ static void Destroy(); bool addEvent(sf::Event *e); static bool TestEvent (Keys k, sf::Event e); -#if defined HAVE_WX && HAVE_WX +#if defined(HAVE_WX) static sf::Key::Code wxCharCodeToSF(int id); #endif static void SFKeyToString(sf::Key::Code keycode, char *keyStr); Modified: trunk/desmume/src/wx/PadSimple/PadSimple.cpp =================================================================== --- trunk/desmume/src/wx/PadSimple/PadSimple.cpp 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/wx/PadSimple/PadSimple.cpp 2010-02-04 06:22:54 UTC (rev 3371) @@ -30,7 +30,7 @@ //#include "FileUtil.h" //#include "ChunkFile.h" -#if defined(HAVE_WX) && HAVE_WX +#if defined(HAVE_WX) #include "GUI/ConfigDlg.h" PADConfigDialogSimple* m_ConfigFrame = NULL; #endif @@ -68,7 +68,7 @@ #ifdef _WIN32 //HINSTANCE g_hInstance; -#if defined(HAVE_WX) && HAVE_WX +#if defined(HAVE_WX) class wxDLLApp : public wxApp { bool OnInit() @@ -88,7 +88,7 @@ { case DLL_PROCESS_ATTACH: { -#if defined(HAVE_WX) && HAVE_WX +#if defined(HAVE_WX) wxSetInstance((HINSTANCE)hinstDLL); int argc = 0; char **argv = NULL; @@ -100,7 +100,7 @@ break; case DLL_PROCESS_DETACH: -#if defined(HAVE_WX) && HAVE_WX +#if defined(HAVE_WX) wxEntryCleanup(); #endif break; @@ -113,7 +113,7 @@ } #endif -#if defined(HAVE_WX) && HAVE_WX +#if defined(HAVE_WX) wxWindow* GetParentedWxWindow(HWND Parent) { #ifdef _WIN32 Added: trunk/desmume/src/wx/touch.exe =================================================================== (Binary files differ) Property changes on: trunk/desmume/src/wx/touch.exe ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/desmume/src/wx/un7z_and_touch.bat =================================================================== --- trunk/desmume/src/wx/un7z_and_touch.bat (rev 0) +++ trunk/desmume/src/wx/un7z_and_touch.bat 2010-02-04 06:22:54 UTC (rev 3371) @@ -0,0 +1,2 @@ +7z x -bd -y -o.libs %1 +touch %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file Added: trunk/desmume/src/wx/wxDeSmuME_2008.sln =================================================================== --- trunk/desmume/src/wx/wxDeSmuME_2008.sln (rev 0) +++ trunk/desmume/src/wx/wxDeSmuME_2008.sln 2010-02-04 06:22:54 UTC (rev 3371) @@ -0,0 +1,32 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxDeSmuME_VS2008", "wxDeSmuME_2008.vcproj", "{9F5F72A1-D3A5-4918-B460-E076B16D10A9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Dev+|Win32 = Dev+|Win32 + Dev+|x64 = Dev+|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.ActiveCfg = Debug|Win32 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.Build.0 = Debug|Win32 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.ActiveCfg = Debug|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.Build.0 = Debug|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|Win32.ActiveCfg = Dev+|Win32 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|Win32.Build.0 = Dev+|Win32 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|x64.ActiveCfg = Dev+|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|x64.Build.0 = Dev+|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.ActiveCfg = Release|Win32 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.Build.0 = Release|Win32 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.ActiveCfg = Release|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Added: trunk/desmume/src/wx/wxDeSmuME_2008.vcproj =================================================================== --- trunk/desmume/src/wx/wxDeSmuME_2008.vcproj (rev 0) +++ trunk/desmume/src/wx/wxDeSmuME_2008.vcproj 2010-02-04 06:22:54 UTC (rev 3371) @@ -0,0 +1,1660 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="wxDeSmuME_VS2008" + ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}" + RootNamespace="DeSmuME" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + <DefaultToolFile + FileName="masm.rules" + /> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)\__bins" + IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + InlineFunctionExpansion="0" + EnableIntrinsicFunctions="false" + FavorSizeOrSpeed="0" + EnableFiberSafeOptimizations="false" + 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" + PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;BETA_VERSION;NOMINMAX;HAVE_LIBZ;WXPORT" + ExceptionHandling="1" + BasicRuntimeChecks="3" + BufferSecurityCheck="true" + EnableEnhancedInstructionSet="2" + FloatingPointModel="2" + DebugInformationFormat="4" + 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-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" + OutputFile="$(OutDir)\$(ProjectName)_debug.exe" + AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs" + DelayLoadDLLs="" + GenerateDebugInformation="true" + GenerateMapFile="true" + RandomizedBaseAddress="1" + DataExecutionPrevention="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="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(SolutionDir)\__bins" + IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + InlineFunctionExpansion="0" + EnableIntrinsicFunctions="false" + FavorSizeOrSpeed="0" + EnableFiberSafeOptimizations="false" + 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" + PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;BETA_VERSION;NOMINMAX;HAVE_LIBZ;WXPORT" + ExceptionHandling="1" + BasicRuntimeChecks="3" + BufferSecurityCheck="true" + EnableEnhancedInstructionSet="0" + FloatingPointModel="2" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib winpcap\x64\wpcap.lib" + OutputFile="$(OutDir)\$(ProjectName)_x64_debug.exe" + AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs" + DelayLoadDLLs="wpcap.dll" + GenerateDebugInformation="true" + GenerateMapFile="true" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + AdditionalManifestFiles="DeSmuME_x64.manifest" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + 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" + 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" + 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="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" + OutputFile="$(OutDir)\$(ProjectName)_release.exe" + AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs" + DelayLoadDLLs="" + 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" + 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" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + 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" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;WXPORT" + StringPooling="true" + ExceptionHandling="1" + StructMemberAlignment="0" + BufferSecurityCheck="false" + EnableEnhancedInstructionSet="0" + FloatingPointModel="2" + WarningLevel="1" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib winpcap\x64\wpcap.lib" + OutputFile="$(OutDir)\$(ProjectName)_x64_release.exe" + AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs" + DelayLoadDLLs="wpcap.dll" + GenerateDebugInformation="true" + OptimizeReferences="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + Profile="false" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + AdditionalManifestFiles="DeSmuME_x64.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" + 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" + 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="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" + OutputFile="$(OutDir)\$(ProjectName)_dev+.exe" + AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs" + DelayLoadDLLs="" + 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" + 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" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + 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" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;WXPORT" + StringPooling="true" + ExceptionHandling="1" + StructMemberAlignment="0" + BufferSecurityCheck="false" + EnableEnhancedInstructionSet="0" + FloatingPointModel="2" + WarningLevel="1" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib winpcap\x64\wpcap.lib" + OutputFile="$(OutDir)\$(ProjectName)_x64_dev+.exe" + AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs" + DelayLoadDLLs="wpcap.dll" + GenerateDebugInformation="true" + OptimizeReferences="2" + LinkTimeCodeGeneration="0" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + Profile="false" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + AdditionalManifestFiles="DeSmuME_x64.manifest" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Core" + > + <File + RelativePath="..\addons.cpp" + > + </File> + <File + RelativePath="..\addons.h" + > + </File> + <File + RelativePath="..\aggdraw.cpp" + > + </File> + <File + RelativePath="..\arm_instructions.cpp" + > + </File> + <File + RelativePath="..\arm_instructions.h" + > + </File> + <File + RelativePath="..\armcpu.cpp" + > + </File> + <File + RelativePath="..\armcpu.h" + > + </File> + <File + RelativePath="..\bios.cpp" + > + </File> + <File + RelativePath="..\bios.h" + > + </File> + <File + RelativePath="..\bits.h" + > + </File> + <File + RelativePath="..\cheatSystem.cpp" + > + </File> + <File + RelativePath="..\cheatSystem.h" + > + </File> + <File + RelativePath="..\commandline.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + CallingConvention="0" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + CallingConvention="0" + /> + </FileConfiguration> + <FileConfiguration + Name="Dev+|Win32" + > + <Tool + Name="VCCLCompilerTool" + CallingConvention="0" + /> + </FileConfiguration> + <FileConfiguration + Name="Release FastBuild|x64" + > + <Tool + Name="VCCLCompilerTool" + CallingConvention="0" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\commandline.h" + > + </File> + <File + RelativePath="..\common.cpp" + > + </File> + <File + RelativePath="..\common.h" + > + </File> + <File + RelativePath="..\cp15.cpp" + > + </File> + <File + RelativePath="..\cp15.h" + > + </File> + <File + RelativePath="..\debug.cpp" + > + </File> + <File + RelativePath="..\debug.h" + > + </File> + <File + RelativePath="..\Disassembler.cpp" + > + </File> + <File + RelativePath="..\Disassembler.h" + > + </File> + <File + RelativePath="..\driver.cpp" + > + </File> + <File + RelativePath="..\driver.h" + > + </File> + <File + RelativePath="..\emufile.cpp" + > + </File> + <File + RelativePath="..\emufile.h" + > + </File> + <File + RelativePath="..\fat.h" + > + </File> + <File + RelativePath="..\FIFO.cpp" + > + </File> + <File + RelativePath="..\FIFO.h" + > + </File> + <File + RelativePath="..\firmware.cpp" + > + </File> + <File + RelativePath="..\firmware.h" + > + </File> + <File + RelativePath="..\fs-windows.cpp" + > + </File> + <File + RelativePath="..\fs.h" + > + </File> + <File + RelativePath="..\gfx3d.cpp" + > + </File> + <File + RelativePath="..\gfx3d.h" + > + </File> + <File + RelativePath="..\GPU.cpp" + > + </File> + <File + RelativePath="..\GPU.h" + > + </File> + <File + RelativePath="..\GPU_OSD.cpp" + > + </File> + <File + RelativePath="..\GPU_osd.h" + > + </File> + <File + RelativePath="..\instruction_tabdef.inc" + > + </File> + <File + RelativePath="..\lua-engine.cpp" + > + </File> + <File + RelativePath="..\lua-engine.h" + > + </File> + <File + RelativePath="..\matrix.cpp" + > + </File> + <File + RelativePath="..\matrix.h" + > + </File> + <File + RelativePath="..\mc.cpp" + > + </File> + <File + RelativePath="..\mc.h" + > + </File> + <File + RelativePath="..\mem.h" + > + </File> + <File + RelativePath="..\mic.h" + > + </File> + <File + RelativePath="..\MMU.cpp" + > + </File> + <File + RelativePath="..\MMU.h" + > + </File> + <File + RelativePath="..\MMU_timing.h" + > + </File> + <File + RelativePath="..\movie.cpp" + > + </File> + <File + RelativePath="..\movie.h" + > + </File> + <File + RelativePath="..\NDSSystem.cpp" + > + </File> + <File + RelativePath="..\NDSSystem.h" + > + </File> + <File + RelativePath="..\OGLRender.h" + > + </File> + <File + RelativePath="..\path.h" + > + </File> + <File + RelativePath="..\rasterize.cpp" + > + </File> + <File + RelativePath="..\rasterize.h" + > + </File> + <File + RelativePath="..\readwrite.cpp" + > + </File> + <File + RelativePath="..\readwrite.h" + > + </File> + <File + RelativePath="..\registers.h" + > + </File> + <File + RelativePath="..\render3D.cpp" + > + </File> + <File + RelativePath="..\render3D.h" + > + </File> + <File + RelativePath="..\ROMReader.cpp" + > + </File> + <File + RelativePath="..\ROMReader.h" + > + </File> + <File + RelativePath="..\rtc.cpp" + > + </File> + <File + RelativePath="..\rtc.h" + > + </File> + <File + RelativePath="..\saves.cpp" + > + </File> + <File + RelativePath="..\saves.h" + > + </File> + <File + RelativePath="..\shaders.h" + > + </File> + <File + RelativePath="..\softrender.h" + > + </File> + <File + RelativePath="..\softrender_config.h" + > + </File> + <File + RelativePath="..\softrender_desmumefont.h" + > + </File> + <File + RelativePath="..\softrender_v3sysfont.h" + > + </File> + <File + RelativePath="..\SPU.cpp" + > + </File> + <File + RelativePath="..\SPU.h" + > + </File> + <File + RelativePath="..\texcache.cpp" + > + </File> + <File + RelativePath="..\texcache.h" + > + </File> + <File + RelativePath="..\thumb_instructions.cpp" + > + </File> + <File + RelativePath="..\thumb_instructions.h" + > + </File> + <File + RelativePath="..\thumb_tabdef.inc" + > + </File> + <File + RelativePath="..\types.h" + > + </File> + <File + RelativePath="..\version.cpp" + > + </File> + <File + RelativePath="..\version.h" + > + </File> + <File + RelativePath="..\wifi.cpp" + > + </File> + <File + RelativePath="..\wifi.h" + > + </File> + <File + RelativePath="..\utils\xstring.h" + > + </File> + <Filter + Name="addons" + > + <File + RelativePath="..\addons\compactFlash.cpp" + > + </File> + <File + RelativePath="..\addons\expMemory.cpp" + > + </File> + <File + RelativePath="..\addons\gbagame.cpp" + > + </File> + <File + RelativePath="..\addons\guitarGrip.cpp" + > + </File> + <File + RelativePath="..\addons\none.cpp" + > + </File> + <File + RelativePath="..\addons\rumblepak.cpp" + > + </File> + </Filter> + <Filter + Name="gdbstub" + > + <File + RelativePath="..\gdbstub\gdbstub.cpp" + > + </File> + <File + RelativePath="..\gdbstub.h" + > + </File> + </Filter> + <Filter + Name="utils" + > + <File + RelativePath="..\utils\ConvertUTF.c" + > + </File> + <File + RelativePath="..\utils\ConvertUTF.h" + > + </File> + <File + RelativePath="..\utils\guid.cpp" + > + </File> + <File + RelativePath="..\utils\guid.h" + > + </File> + <File + RelativePath="..\utils\md5.cpp" + > + </File> + <File + RelativePath="..\utils\md5.h" + > + </File> + <File + RelativePath="..\utils\task.cpp" + > + </File> + <File + RelativePath="..\utils\task.h" + > + </File> + <File + RelativePath="..\utils\valuearray.h" + > + </File> + <File + RelativePath="..\utils\xstring.cpp" + > + </File> + <Filter + Name="decrypt" + > + <File + RelativePath="..\utils\decrypt\crc.cpp" + > + </File> + <File + RelativePath="..\utils\decrypt\crc.h" + > + </File> + <File + RelativePath="..\utils\decrypt\decrypt.cpp" + > + </File> + <File + RelativePath="..\utils\decrypt\decrypt.h" + > + </File> + <File + RelativePath="..\utils\decrypt\header.cpp" + > + </File> + <File + RelativePath="..\utils\decrypt\header.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="metaspu" + > + <File + RelativePath="..\metaspu\metaspu.cpp" + > + </File> + <File + RelativePath="..\metaspu\metaspu.h" + > + </File> + <File + RelativePath="..\metaspu\SndOut.cpp" + > + </File> + <File + RelativePath="..\metaspu\SndOut.h" + > + </File> + <File + RelativePath="..\metaspu\Timestretcher.cpp" + > + </File> + <Filter + Name="win32" + > + <File + RelativePath="..\metaspu\win32\ConfigSoundtouch.cpp" + > + </File> + <File + RelativePath="..\metaspu\win32\Dialogs.h" + > + </File> + </Filter> + <Filter + Name="SoundTouch" + > + <File + RelativePath="..\metaspu\SoundTouch\3dnow_win.cpp" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\AAFilter.cpp" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\AAFilter.h" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\BPMDetect.h" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\cpu_detect.h" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\cpu_detect_x86_win.cpp" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\FIFOSampleBuffer.cpp" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\FIFOSampleBuffer.h" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\FIFOSamplePipe.h" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\FIRFilter.cpp" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\FIRFilter.h" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\mmx_optimized.cpp" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\RateTransposer.cpp" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\RateTransposer.h" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\SoundTouch.cpp" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\SoundTouch.h" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\sse_optimized.cpp" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\STTypes.h" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\TDStretch.cpp" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\TDStretch.h" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\WavFile.cpp" + > + </File> + <File + RelativePath="..\metaspu\SoundTouch\WavFile.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="wxdlg" + > + <File + RelativePath="..\wxdlg\wxdlg3dViewer.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + IgnoreStandardIncludePath="false" + GeneratePreprocessedFile="0" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\wxdlg\wxdlg3dViewer.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="windows" + > + <File + RelativePath="..\windows\console.cpp" + > + </File> + <File + RelativePath="..\windows\mic.cpp" + > + </File> + </Filter> + <Filter + Name="wx" + > + <File + RelativePath=".\IniFile.cpp" + > + </File> + <File + RelativePath=".\IniFile.h" + > + </File> + <File + RelativePath=".\LuaWindow.cpp" + > + </File> + <File + RelativePath=".\LuaWindow.h" + > + </File> + <File + RelativePath=".\StringUtil.cpp" + > + </File> + <File + RelativePath=".\StringUtil.h" + > + </File> + <File + RelativePath=".\wxMain.cpp" + > + </File> + <Filter + Name="PadSimple" + > + <File + RelativePath=".\PadSimple\PadSimple.h" + > + </File> + <File + RelativePath=".\PadSimple\pluginspecs_pad.h" + > + </File> + <Filter + Name="GUI" + > + <File + RelativePath=".\PadSimple\GUI\ConfigDlg.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="InputCommon" + > + <File + RelativePath=".\InputCommon\DirectInputBase.cpp" + > + </File> + <File + RelativePath=".\InputCommon\DirectInputBase.h" + > + </File> + <File + RelativePath=".\InputCommon\Event.hpp" + > + </File> + <File + RelativePath=".\InputCommon\EventHandler.cpp" + > + </File> + <File + RelativePath=".\InputCommon\EventHandler.h" + > + </File> + <File + RelativePath=".\InputCommon\InputCommon.cpp" + > + </File> + <File + RelativePath=".\InputCommon\InputCommon.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="libs" + > + <File + RelativePath=".\7z\7z.7z" + > + <FileConfiguration + Name="Debug|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" + > + <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|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" + > + <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="Release FastBuild|x64" + > + <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> + </File> + <File + RelativePath=".\directx\directx.7z" + > + <FileConfiguration + Name="Debug|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" + > + <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|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" + > + <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="Release FastBuild|x64" + > + <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> + </File> + <File + RelativePath=".\glib-2.20.1\glib-2.20.1.7z" + > + <FileConfiguration + Name="Debug|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" + > + <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|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" + > + <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="Release FastBuild|x64" + > + <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> + </File> + <File + RelativePath=".\lua\lua.7z" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*
" + AdditionalDependencies="7z.exe;un7z_and_touch.bat" + Outputs=".libs\lua.tag" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*
" + 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\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 ..\windows\lua\lua.7z .libs\lua*
" + 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\lua*
" + AdditionalDependencies="7z.exe;un7z_and_touch.bat" + Outputs=".libs\lua.tag" + /> + </FileConfiguration> + <FileConfiguration + Name="Release FastBuild|x64" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*
" + AdditionalDependencies="7z.exe;un7z_and_touch.bat" + Outputs=".libs\lua.tag" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\wx\wx.7z" + > + <FileConfiguration + Name="Debug|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" + > + <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|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" + > + <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="Release FastBuild|x64" + > + <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> + </File> + </Filter> + </Files> + <Globals> + <Global + Name="RESOURCE_FILE" + Value="resources.rc" + /> + </Globals> +</VisualStudioProject> Modified: trunk/desmume/src/wx/wxMain.cpp =================================================================== --- trunk/desmume/src/wx/wxMain.cpp 2010-02-04 03:11:08 UTC (rev 3370) +++ trunk/desmume/src/wx/wxMain.cpp 2010-02-04 06:22:54 UTC (rev 3371) @@ -18,6 +18,10 @@ #include "rasterize.h" #include "OGLRender.h" +#ifdef WIN32 +#include "snddx.h" +#endif + #include <wx/stdpaths.h> #include "LuaWindow.h" @@ -31,7 +35,7 @@ SoundInterface_struct *SNDCoreList[] = { &SNDDummy, #ifdef WIN32 - &SNDDIRECTX, +// &SNDDIRECTX, #else &SNDSDL, #endif @@ -39,10 +43,12 @@ }; GPU3DInterface *core3DList[] = { + &gpu3DRasterize, +#ifndef WIN32 + &gpu3Dgl, +#endif &gpu3DNull, - &gpu3Dgl, - &gpu3DRasterize, - NULL + NULL }; /* lua stuff stubs */ @@ -93,7 +99,11 @@ SPADStatus s; memset(&s,0,sizeof(s)); + + //TODO !!!!!!!!!!!!!!!!!!!!!! FIXME!!!!!!!!!!1 +#ifndef _MSC_VER PAD_GetStatus(0, &s); +#endif if(s.button & PAD_BUTTON_LEFT) left = true; @@ -309,7 +319,9 @@ void OnOpenControllerConfiguration(wxCommandEvent& WXUNUSED (event)) { +#ifndef _MSC_VER new PADConfigDialogSimple(this); +#endif } wxMenu* MakeStatesSubMenu( int baseid ) const @@ -438,6 +450,7 @@ Desmume_InitOnce(); aggDraw.hud->attach((u8*)GPU_screen, 256, 384, 1024);//TODO + NDS_3D_ChangeCore(0); #ifdef __WIN32__ extern void OpenConsole(); @@ -459,7 +472,9 @@ SPADInitialize PADInitialize; PADInitialize.padNumber = 1; extern void Initialize(void *init); +#ifndef _WIN32 Initialize(&PADInitialize); +#endif //TODO addon_type = NDS_ADDON_NONE; @@ -561,3 +576,22 @@ // CreateStatusBar(2); // SetStatusText("Welcome to Desmume!"); } + +#ifdef _WIN32 +/* +* The thread handling functions needed by the GDB stub code. +*/ +void * +createThread_gdb( void (APIENTRY *thread_function)( void *data), + void *thread_data) { + void *new_thread = CreateThread( NULL, 0, + (LPTHREAD_START_ROUTINE)thread_function, thread_data, + 0, NULL); + + return new_thread; +} + +void +joinThread_gdb( void *thread_handle) { +} +#endif \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |