Browse Source

Configuration: fix MinGW32 & WP8 builds

LouYihua 7 years ago
parent
commit
cb1e0a9577
2 changed files with 6 additions and 107 deletions
  1. 0 102
      win32/sdlpal.rc
  2. 6 5
      winrt/SDLPal.WindowsPhone/App.xaml.cpp

+ 0 - 102
win32/sdlpal.rc

@@ -110,30 +110,6 @@ BEGIN
 END
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_LAUNCHER DLGINIT
-BEGIN
-    IDC_CD, 0x403, 4, 0, 0x504d, 0x0033, 
-    IDC_CD, 0x403, 4, 0, 0x474f, 0x0047, 
-    IDC_BGM, 0x403, 4, 0, 0x4952, 0x0058, 
-    IDC_BGM, 0x403, 5, 0, 0x494d, 0x4944, "\000" 
-    IDC_BGM, 0x403, 4, 0, 0x504d, 0x0033, 
-    IDC_BGM, 0x403, 4, 0, 0x474f, 0x0047, 
-    IDC_OPL, 0x403, 7, 0, 0x4f44, 0x4253, 0x584f, "\000" 
-    IDC_OPL, 0x403, 5, 0, 0x414d, 0x454d, "\000" 
-    IDC_LOGLEVEL, 0x403, 8, 0, 0x6556, 0x6272, 0x736f, 0x0065, 
-    IDC_LOGLEVEL, 0x403, 6, 0, 0x6544, 0x7562, 0x0067, 
-    IDC_LOGLEVEL, 0x403, 14, 0, 0x6e49, 0x6f66, 0x6d72, 0x7461, 0x6f69, 0x616e, 0x006c, 
-    IDC_LOGLEVEL, 0x403, 8, 0, 0x6157, 0x6e72, 0x6e69, 0x0067, 
-    IDC_LOGLEVEL, 0x403, 6, 0, 0x6146, 0x6174, 0x006c, 
-    0
-END
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // RT_MANIFEST
@@ -323,45 +299,6 @@ BEGIN
 END
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_LAUNCHER DLGINIT
-BEGIN
-    IDC_CD, 0x403, 4, 0
-0x504d, 0x0033, 
-    IDC_CD, 0x403, 4, 0
-0x474f, 0x0047, 
-    IDC_BGM, 0x403, 4, 0
-0x4952, 0x0058, 
-    IDC_BGM, 0x403, 5, 0
-0x494d, 0x4944, "\000" 
-    IDC_BGM, 0x403, 4, 0
-0x504d, 0x0033, 
-    IDC_BGM, 0x403, 4, 0
-0x474f, 0x0047, 
-    IDC_OPL, 0x403, 7, 0
-0x4f44, 0x4253, 0x584f, "\000" 
-    IDC_OPL, 0x403, 5, 0
-0x414d, 0x454d, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0xeacf, 0xb8cf, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0xf7b5, 0xd4ca, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0xc5d0, 0xa2cf, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0xafbe, 0xe6b8, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0xedb4, 0xf3ce, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0xc2d6, 0xfcc3, "\000" 
-    0
-END
-
-
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -520,45 +457,6 @@ BEGIN
 END
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_LAUNCHER DLGINIT
-BEGIN
-    IDC_CD, 0x403, 4, 0
-0x504d, 0x0033, 
-    IDC_CD, 0x403, 4, 0
-0x474f, 0x0047, 
-    IDC_BGM, 0x403, 4, 0
-0x4952, 0x0058, 
-    IDC_BGM, 0x403, 5, 0
-0x494d, 0x4944, "\000" 
-    IDC_BGM, 0x403, 4, 0
-0x504d, 0x0033, 
-    IDC_BGM, 0x403, 4, 0
-0x474f, 0x0047, 
-    IDC_OPL, 0x403, 7, 0
-0x4f44, 0x4253, 0x584f, "\000" 
-    IDC_OPL, 0x403, 5, 0
-0x414d, 0x454d, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0xd4b8, 0xd3b2, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0xd5bd, 0xd5b8, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0x48ab, 0xa7ae, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0xb5c4, 0x69a7, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0xf9bf, 0x7ebb, "\000" 
-    IDC_LOGLEVEL, 0x403, 5, 0
-0x50ad, 0x52a9, "\000" 
-    0
-END
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table

+ 6 - 5
winrt/SDLPal.WindowsPhone/App.xaml.cpp

@@ -139,16 +139,17 @@ void SDLPal::App::OnActivated(Windows::ApplicationModel::Activation::IActivatedE
 		auto e = safe_cast<IFileOpenPickerContinuationEventArgs^>(args);
 		if (e->Files->Size > 0)
 		{
-			auto target = static_cast<Windows::UI::Xaml::Controls::TextBox^>(e->ContinuationData->Lookup("Target"));
-			page->SetFile(target, e->Files->GetAt(0));
+			page->SetFile(static_cast<Windows::UI::Xaml::Controls::TextBox^>(e->ContinuationData->Lookup("Target")), e->Files->GetAt(0));
 		}
 		break;
 	}
 	case ActivationKind::PickSaveFileContinuation:
 	{
-		auto file = safe_cast<IFileSavePickerContinuationEventArgs^>(args)->File;
-		auto target = static_cast<Windows::UI::Xaml::Controls::TextBox^>(e->ContinuationData->Lookup("Target"));
-		if (file) page->SetFile(target, file);
+		auto e = safe_cast<IFileSavePickerContinuationEventArgs^>(args);
+		if (e->File)
+		{
+			page->SetFile(static_cast<Windows::UI::Xaml::Controls::TextBox^>(e->ContinuationData->Lookup("Target")), e->File);
+		}
 		break;
 	}
 	}