Fix MinGW32 build

win32/Application.manifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="CompanyName.ProductName.YourApplication" type="win32" />
-	<description>Your application description here.</description>
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="SDLPal" type="win32" />
+	<description>SDLPal main application.</description>
 	<dependency>
 		<dependentAssembly>
 			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" />

win32/Makefile

@@ -1,7 +1,7 @@
-# Makefile for win32 platforms with mingw
+# Makefile for win32 platforms with mingw under msys or linux
 
 TARGET = sdlpal.exe
-TEST_TARGET = ./sdlpal-tests
+TEST_TARGET = sdlpal-tests.exe
 
 HOST =
 TEST_CCFLAGS =
@@ -10,7 +10,7 @@ GTEST_DIR = ../3rd/googletest/googletest
 
 CFILES = $(wildcard ../adplug/*.c) $(wildcard ../libmad/*.c) $(wildcard ../liboggvorbis/src/*.c) $(wildcard ../*.c) ../native_midi/native_midi_win32.c ../native_midi/native_midi_common.c
 CPPFILES = $(wildcard ../adplug/*.cpp) $(wildcard ../*.cpp) $(wildcard ./*.cpp)
-RCFILES = $(wildcard ./*.rc)
+RCFILES = $(wildcard ./sdlpal.rc)
 OBJFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(RCFILES:.rc=.o)
 TEST_CPPFILES = $(wildcard ../tests/*.cpp)
 TEST_OBJFILES = $(TEST_CPPFILES:.cpp=.o)
@@ -47,7 +47,7 @@ gtest-all.o : $(GTEST_DIR)/src/gtest-all.cc
 
 $(TEST_TARGET): $(OBJFILES) $(TEST_OBJFILES) gtest-all.o
 	@echo [LD] $@
-	@$(HOST)g++ $^ -o $@ $(LDFLAGS) -lpthread
+	@$(HOST)g++ $^ -o $@ $(LDFLAGS) -pthread
 
 clean:
 	-rm -f $(TARGET) $(TEST_TARGET) $(OBJFILES) $(TEST_OBJFILES)

win32/Makefile.mingw

@@ -1,4 +1,4 @@
-# Makefile for win32 platforms with mingw
+# Makefile for win32 platforms with mingw under win32
 
 TARGET = sdlpal.exe
 TEST_TARGET = sdlpal-tests.exe
@@ -10,7 +10,7 @@ GTEST_DIR = ../3rd/googletest/googletest
 
 CFILES = $(wildcard ../adplug/*.c) $(wildcard ../libmad/*.c) $(wildcard ../liboggvorbis/src/*.c) $(wildcard ../*.c) ../native_midi/native_midi_win32.c ../native_midi/native_midi_common.c
 CPPFILES = $(wildcard ../adplug/*.cpp) $(wildcard ../*.cpp) $(wildcard ./*.cpp)
-RCFILES = $(wildcard ./*.rc)
+RCFILES = $(wildcard ./sdlpal.rc)
 OBJFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(RCFILES:.rc=.o)
 TEST_CPPFILES = $(wildcard ../tests/*.cpp)
 TEST_OBJFILES = $(TEST_CPPFILES:.cpp=.o)
@@ -43,7 +43,7 @@ gtest-all.o : $(GTEST_DIR)/src/gtest-all.cc
 
 %.o: %.rc
 	@echo [RES] $^
-	@windres -i $^ -o $@
+	@$(HOST)windres -i $^ -o $@
 
 $(TEST_TARGET): $(OBJFILES) $(TEST_OBJFILES) gtest-all.o
 	@echo [LD] $@

win32/resource.h

@@ -5,6 +5,7 @@
 #define IDI_SDLPAL                      101
 #define IDD_LAUNCHER                    101
 #define IDS_CONFIRM                     103
+#define APP_MANIFEST                    1
 #define IDC_GAMEPATH                    1000
 #define IDC_CHT                         1001
 #define IDC_CHS                         1002

win32/resources.rc

@@ -1 +0,0 @@
-1 24 "Application.manifest"

win32/sdlpal.rc

@@ -130,6 +130,63 @@ BEGIN
 END
 
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// RT_MANIFEST
+//
+
+APP_MANIFEST            RT_MANIFEST             "Application.manifest"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_SDLPAL              ICON                    "../sdlpal.ico"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 2,0,0,1
+ PRODUCTVERSION 2,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "080404b0"
+        BEGIN
+            VALUE "CompanyName", "SDLPAL Team"
+            VALUE "FileDescription", "SDLPAL Main executable"
+            VALUE "FileVersion", "2.0.0.1"
+            VALUE "InternalName", "sdlpal.exe"
+            VALUE "LegalCopyright", "Copyright (C) SDLPAL Team 2008 - 2017"
+            VALUE "OriginalFilename", "sdlpal.exe"
+            VALUE "ProductName", "SDL PAL"
+            VALUE "ProductVersion", "2.0.0.1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x804, 1200
+    END
+END
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
@@ -267,16 +324,6 @@ BEGIN
 END
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_SDLPAL              ICON                    "../sdlpal.ico"
-
-
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -290,7 +337,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""Windows.h""\r\n"
+    "#include ""windows.h""\r\n"
     "\0"
 END
 
@@ -303,45 +350,6 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,1
- PRODUCTVERSION 2,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "080404b0"
-        BEGIN
-            VALUE "CompanyName", "SDLPAL Team"
-            VALUE "FileDescription", "SDLPAL Main executable"
-            VALUE "FileVersion", "2.0.0.1"
-            VALUE "InternalName", "sdlpal.exe"
-            VALUE "LegalCopyright", "Copyright (C) SDLPAL Team 2008 - 2017"
-            VALUE "OriginalFilename", "sdlpal.exe"
-            VALUE "ProductName", "SDL PAL"
-            VALUE "ProductVersion", "2.0.0.1"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x804, 1200
-    END
-END
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
@@ -362,7 +370,7 @@ END
 
 
 /////////////////////////////////////////////////////////////////////////////
-// 中文(繁体，台湾) resources
+// 中文(繁体，中国台湾) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHT)
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
@@ -494,7 +502,7 @@ BEGIN
     IDC_BRGAME              "ゴ秨笴栏戈方郎Ж"
 END
 
-#endif    // 中文(繁体，台湾) resources
+#endif    // 中文(繁体，中国台湾) resources
 /////////////////////////////////////////////////////////////////////////////
 
 

win32/sdlpal.vcxproj

@@ -144,7 +144,7 @@
       <Culture>0x0804</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -173,7 +173,7 @@
       <Culture>0x0804</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -204,7 +204,7 @@
       <Culture>0x0804</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -236,7 +236,7 @@
       <Culture>0x0804</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>
@@ -267,7 +267,7 @@
       <Culture>0x0804</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -296,7 +296,7 @@
       <Culture>0x0804</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;winmm.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -553,6 +553,9 @@
     <Text Include="..\AUTHORS.txt" />
     <Text Include="..\README.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="Application.manifest" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

win32/sdlpal.vcxproj.filters

@@ -707,4 +707,9 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="Application.manifest">
+      <Filter>Resource Files</Filter>
+    </Manifest>
+  </ItemGroup>
 </Project>

win32/win32.cpp

@@ -13,11 +13,6 @@
 #include "../palcfg.h"
 #include "../resampler.h"
 
-#pragma comment(lib, "comctl32.lib")
-#pragma comment(linker,"\"/manifestdependency:type='win32' \
-name='Microsoft.Windows.Common-Controls' version='6.0.0.0' \
-processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
-
 #define ComboBox_AddString(hwndDlg, idCtrl, lpsz) \
             (BOOL)SNDMSG(GetDlgItem((hwndDlg), (idCtrl)), CB_ADDSTRING, (WPARAM)(0), (LPARAM)(lpsz))
 #define ComboBox_SetCurSel(hwndDlg, idCtrl, index) \