From 7a6eb0f3504f1935a4b8707f281b66a76d9edd7a Mon Sep 17 00:00:00 2001 From: John Peterson Date: Thu, 12 Nov 2009 19:50:45 +0000 Subject: [PATCH] GUI > Fixed the restart to debugging/non-debugging option, GetModuleFileName use the full path now, should not fail git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4541 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/Frame.h | 1 + Source/Dolphin.sln | 3 ++- Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj | 12 ++++++------ .../Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj | 12 ++++++------ 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index e63189c227..c8df3c4954 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -250,6 +250,7 @@ class CFrame : public wxFrame #endif // Event functions void OnQuit(wxCommandEvent& event); + void OnRestart(wxCommandEvent& WXUNUSED (event)); void OnHelp(wxCommandEvent& event); void OnToolBar(wxCommandEvent& event); void OnAuiToolBar(wxAuiToolBarEvent& event); diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln index 821a04a023..43a5caca22 100644 --- a/Source/Dolphin.sln +++ b/Source/Dolphin.sln @@ -708,7 +708,8 @@ Global {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.DebugFast|Win32.Build.0 = Debug|Win32 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.DebugFast|x64.ActiveCfg = Debug|x64 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.DebugFast|x64.Build.0 = Debug|x64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_JITIL|Win32.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_JITIL|Win32.ActiveCfg = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_JITIL|Win32.Build.0 = Release|Win32 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_JITIL|x64.ActiveCfg = Release|x64 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_JITIL|x64.Build.0 = Release|x64 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj index 7ebb7631c0..0f0563fb38 100644 --- a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj +++ b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj @@ -70,7 +70,7 @@ AdditionalDependencies="xinput.lib comctl32.lib winmm.lib wiiuse.lib rpcrt4.lib wxbase28ud.lib wxmsw28ud_core.lib" OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_WiimoteD.dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\Externals\SDL\win32;..\..\..\Externals\WiiUse\win32;..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" + AdditionalLibraryDirectories=""..\..\..\Externals\SDL\VisualC\SDL\$(ConfigurationName)";..\..\..\Externals\WiiUse\win32;..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" @@ -154,7 +154,7 @@ AdditionalDependencies="SDL.lib xinput.lib comctl32.lib winmm.lib wiiuse.lib rpcrt4.lib wxbase28ud.lib wxmsw28ud_core.lib" OutputFile="..\..\..\Binary\x64\Plugins\Plugin_WiimoteD.dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\Externals\SDL\x64;..\..\..\Externals\WiiUse\x64;..\..\..\Externals\wxWidgets\lib\vc_lib\x64" + AdditionalLibraryDirectories=""..\..\..\Externals\SDL\VisualC\SDL\$(PlatformName)\$(ConfigurationName)";..\..\..\Externals\WiiUse\x64;..\..\..\Externals\wxWidgets\lib\vc_lib\x64" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" @@ -238,7 +238,7 @@ AdditionalDependencies="SDL.lib xinput.lib comctl32.lib winmm.lib wiiuse.lib wxbase28u.lib wxmsw28u_core.lib" OutputFile="..\..\..\Binary\Win32\Plugins\Plugin_Wiimote.dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\Externals\SDL\win32;..\..\..\Externals\WiiUse\win32;..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" + AdditionalLibraryDirectories="..\..\..\Externals\SDL\VisualC\SDL\$(ConfigurationName);..\..\..\Externals\WiiUse\win32;..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" @@ -323,7 +323,7 @@ AdditionalDependencies="SDL.lib xinput.lib comctl32.lib winmm.lib wiiuse.lib wxbase28u.lib wxmsw28u_core.lib" OutputFile="..\..\..\Binary\x64\Plugins\Plugin_Wiimote.dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\Externals\SDL\x64;..\..\..\Externals\WiiUse\x64;..\..\..\Externals\wxWidgets\lib\vc_lib\x64" + AdditionalLibraryDirectories=""..\..\..\Externals\SDL\VisualC\SDL\$(PlatformName)\$(ConfigurationName)";..\..\..\Externals\WiiUse\x64;..\..\..\Externals\wxWidgets\lib\vc_lib\x64" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" @@ -405,7 +405,7 @@ AdditionalDependencies="SDL.lib xinput.lib comctl32.lib winmm.lib wiiuse.lib wxbase28u.lib wxmsw28u_core.lib" OutputFile="..\..\..\Binary\Win32\Plugins\Plugin_WiimoteDF.dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\Externals\SDL\win32;..\..\..\Externals\WiiUse\win32;..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" + AdditionalLibraryDirectories="..\..\..\Externals\SDL\VisualC\SDL\Debug;..\..\..\Externals\WiiUse\win32;..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" @@ -487,7 +487,7 @@ AdditionalDependencies="SDL.lib xinput.lib comctl32.lib winmm.lib wiiuse.lib wxbase28u.lib wxmsw28u_core.lib" OutputFile="..\..\..\Binary\x64\Plugins\Plugin_WiimoteDF.dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\Externals\SDL\x64;..\..\..\Externals\WiiUse\x64;..\..\..\Externals\wxWidgets\lib\vc_lib\x64" + AdditionalLibraryDirectories=""..\..\..\Externals\SDL\VisualC\SDL\$(PlatformName)\Debug";..\..\..\Externals\WiiUse\x64;..\..\..\Externals\wxWidgets\lib\vc_lib\x64" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" diff --git a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj index 1bc24c3873..c933a21557 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj +++ b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj @@ -68,7 +68,7 @@ AdditionalDependencies="SDL.lib comctl32.lib rpcrt4.lib xinput.lib winmm.lib wxbase28ud.lib wxmsw28ud_core.lib" OutputFile="..\..\..\Binary\Win32\Plugins\$(ProjectName)D.dll" LinkIncremental="2" - AdditionalLibraryDirectories="..\..\..\Externals\SDL\win32;..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" + AdditionalLibraryDirectories=""..\..\..\Externals\SDL\VisualC\SDL\$(ConfigurationName)";..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" @@ -149,7 +149,7 @@ AdditionalDependencies="SDL.lib comctl32.lib rpcrt4.lib xinput.lib winmm.lib wxbase28ud.lib wxmsw28ud_core.lib" OutputFile="..\..\..\Binary\x64\Plugins\$(ProjectName)D.dll" LinkIncremental="2" - AdditionalLibraryDirectories="..\..\..\Externals\SDL\x64;..\..\..\Externals\wxWidgets\lib\vc_lib\x64" + AdditionalLibraryDirectories=""..\..\..\Externals\SDL\VisualC\SDL\$(PlatformName)\$(ConfigurationName)";..\..\..\Externals\wxWidgets\lib\vc_lib\x64" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" @@ -228,7 +228,7 @@ AdditionalDependencies="SDL.lib comctl32.lib xinput.lib winmm.lib wxbase28u.lib wxmsw28u_core.lib" OutputFile="..\..\..\Binary\Win32\Plugins\$(ProjectName).dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\Externals\SDL\win32;..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" + AdditionalLibraryDirectories=""..\..\..\Externals\SDL\VisualC\SDL\$(ConfigurationName)";..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" @@ -309,7 +309,7 @@ AdditionalDependencies="SDL.lib comctl32.lib xinput.lib winmm.lib wxbase28u.lib wxmsw28u_core.lib" OutputFile="..\..\..\Binary\x64\Plugins\$(ProjectName).dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\Externals\SDL\x64;..\..\..\Externals\wxWidgets\lib\vc_lib\x64" + AdditionalLibraryDirectories=""..\..\..\Externals\SDL\VisualC\SDL\$(PlatformName)\$(ConfigurationName)";..\..\..\Externals\wxWidgets\lib\vc_lib\x64" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" @@ -390,7 +390,7 @@ AdditionalDependencies="SDL.lib comctl32.lib rpcrt4.lib xinput.lib winmm.lib wxbase28u.lib wxmsw28u_core.lib" OutputFile="..\..\..\Binary\Win32\Plugins\$(ProjectName)DF.dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\Externals\SDL\win32;..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" + AdditionalLibraryDirectories="..\..\..\Externals\SDL\VisualC\SDL\Debug;..\..\..\Externals\wxWidgets\lib\vc_lib\Win32" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" @@ -471,7 +471,7 @@ AdditionalDependencies="SDL.lib comctl32.lib rpcrt4.lib xinput.lib winmm.lib wxbase28u.lib wxmsw28u_core.lib" OutputFile="..\..\..\Binary\x64\Plugins\$(ProjectName)DF.dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib\vc_lib\x64" + AdditionalLibraryDirectories=""..\..\..\Externals\SDL\VisualC\SDL\$(PlatformName)\Debug";..\..\..\Externals\wxWidgets\lib\vc_lib\x64" GenerateManifest="false" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"