Merge pull request #19889 from oltolm/mingw32

remove more `__MINGW32__` ifdefs
hrydgard · Jan 19, 2025 · e2c9376 · e2c9376
2 parents fd36a79 + f11674b
commit e2c9376
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 127 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -26,9 +26,6 @@ charset = utf-8-bom
 # This file may need to force a BOM so compilers treat as utf-8.
 charset = utf-8-bom
 
-[Windows/{aboutbox.rc,version.rc}]
-charset = utf-8
-
 [ext/at3_standalone/**.{cpp,h}]
 indent_style = space
 indent_size = 4

diff --git a/Common/File/DirListing.cpp b/Common/File/DirListing.cpp
@@ -1,12 +1,5 @@
 #include "ppsspp_config.h"
 
-#ifdef __MINGW32__
-#include <unistd.h>
-#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
-#endif
-#endif
-
 #if PPSSPP_PLATFORM(WINDOWS)
 #define WIN32_LEAN_AND_MEAN
 #include "Common/CommonWindows.h"

diff --git a/Common/File/FileUtil.h b/Common/File/FileUtil.h
@@ -27,7 +27,7 @@
 
 // Some functions here support Android content URIs. These are marked as such.
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 inline struct tm* localtime_r(const time_t *clock, struct tm *result) {
 	if (localtime_s(result, clock) == 0)
 		return result;

diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp
@@ -15,15 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#ifdef __MINGW32__
-#include <unistd.h>
-#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
-#endif
-#endif
-
-
 #include <algorithm>
+#include <ctime>
 #include <thread>
 
 #include "Common/Data/Encoding/Utf8.h"

diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp
@@ -17,13 +17,6 @@
 
 #include "ppsspp_config.h"
 
-#ifdef __MINGW32__
-#include <unistd.h>
-#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
-#endif
-#endif
-
 #include <algorithm>
 #include <ctime>
 #include <limits>
@@ -741,7 +734,7 @@ static void tmFromFiletime(tm &dest, const FILETIME &src) {
 	u64 from_1970_us = from_1601_us - FILETIME_FROM_UNIX_EPOCH_US;
 
 	time_t t = (time_t) (from_1970_us / 1000000UL);
-	localtime_r(&t, &dest);
+	localtime_s(&dest, &t);
 }
 #endif
 

diff --git a/Core/FileSystems/VirtualDiscFileSystem.cpp b/Core/FileSystems/VirtualDiscFileSystem.cpp
@@ -16,12 +16,6 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "ppsspp_config.h"
-#ifdef __MINGW32__
-#include <unistd.h>
-#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
-#endif
-#endif
 #include <ctime>
 
 #include "Common/File/FileUtil.h"
@@ -656,7 +650,7 @@ static void tmFromFiletime(tm &dest, const FILETIME &src)
 	u64 from_1970_us = from_1601_us - FILETIME_FROM_UNIX_EPOCH_US;
 
 	time_t t = (time_t) (from_1970_us / 1000000UL);
-	localtime_r(&t, &dest);
+	localtime_s(&dest, &t);
 }
 #endif
 

diff --git a/Core/HLE/sceSircs.cpp b/Core/HLE/sceSircs.cpp
@@ -15,9 +15,6 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#ifdef __MINGW32__
-#include <unistd.h>
-#endif
 #include <ctime>
 
 #include "Common/System/System.h"

diff --git a/Core/Replay.cpp b/Core/Replay.cpp
@@ -15,13 +15,6 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#ifdef __MINGW32__
-#include <unistd.h>
-#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
-#endif
-#endif
-
 #include <cstring>
 #include <ctime>
 #include <vector>

diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
@@ -1703,14 +1703,12 @@
     <None Include="zipup.cmd" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="aboutbox.rc" />
     <ResourceCompile Include="ppsspp.rc">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
-    <None Include="version.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.vcxproj">

diff --git a/Windows/aboutbox.rc b/Windows/aboutbox.rc
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
@@ -103,8 +103,8 @@ END
 // Version
 //
 
-// no utf-16 support when using mingw's resource compiler
-#ifdef __MINGW32__
+#pragma code_page(65001)
+
 // win-version.h is generated by git-version-gen.cmd.
 #include "win-version.h"
 
@@ -126,11 +126,11 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "PPSSPP PSP emulator"
-            VALUE "CompanyName", "Henrik Rydg\xE5rd"
+            VALUE "CompanyName", "Henrik Rydgård"
             VALUE "FileDescription", "PPSSPP"
             VALUE "FileVersion", PPSSPP_WIN_VERSION_STRING
             VALUE "InternalName", "PPSSPPEmu"
-            VALUE "LegalCopyright", "Copyright \xA9 2006-2021 by Henrik Rydg\xE5rd"
+            VALUE "LegalCopyright", "Copyright © 2006-2021 by Henrik Rydgård"
             VALUE "LegalTrademarks", "All product names are trademarks of their respective owners."
             VALUE "OriginalFilename", "PPSSPP.exe"
             VALUE "ProductName", "PPSSPP"
@@ -142,9 +142,6 @@ BEGIN
         VALUE "Translation", 0x409, 1200
     END
 END
-#else
-#include "version.rc"
-#endif
 
 #endif    // Neutral (Default) resources
 /////////////////////////////////////////////////////////////////////////////
@@ -274,8 +271,8 @@ BEGIN
     CONTROL         "",IDC_GEDBG_MATRICES,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER | WS_TABSTOP,7,7,217,86
 END
 
-// no utf-16 support when using mingw's resource compiler
-#ifdef __MINGW32__
+#pragma code_page(65001)
+
 IDD_ABOUTBOX DIALOGEX 0, 0, 301, 163
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
@@ -284,17 +281,14 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,243,140,50,14
     ICON            IDI_PPSSPP,IDC_STATIC,10,9,21,20
     LTEXT           "PPSSPP",IDC_VERSION,40,8,127,9
-    LTEXT           "Copyright \xA9 by Henrik Rydg\xE5rd  the PPSSPP project 2012-",IDC_STATIC,40,33,253,8
+    LTEXT           "Copyright © by Henrik Rydgård  the PPSSPP project 2012-",IDC_STATIC,40,33,253,8
     LTEXT           "All trademarks are property of their respective owners.\nThe emulator is for educational and development purposes only and it may not be used to play games you do not legally own.",IDC_STATIC,40,102,253,24
     LTEXT           "PSP emulator and debugger",IDC_STATIC,40,19,253,8
     LTEXT           "CISO decompression code by BOOSTER",IDC_STATIC,48,73,240,8
     LTEXT           "PSPSDK by #pspdev (freenode)",IDC_STATIC,48,62,240,8
     LTEXT           "zlib by Jean-loup Gailly (compression) and Mark Adler (decompression)",IDC_STATIC,48,85,240,8
     LTEXT           "Additional credits:",IDC_STATIC,40,49,253,8
 END
-#else
-#include "aboutbox.rc"
-#endif
 
 IDD_MEMORY DIALOGEX 0, 0, 700, 310
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

diff --git a/Windows/version.rc b/Windows/version.rc
diff --git a/ext/SPIRV-Cross-build/CMakeLists.txt b/ext/SPIRV-Cross-build/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 project(SPIRV-Cross)
 enable_testing()
 

diff --git a/ext/discord-rpc-build/CMakeLists.txt b/ext/discord-rpc-build/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.0)
+cmake_minimum_required (VERSION 3.10.0)
 project (DiscordRPC)
 
 set(SRC_DIR ../discord-rpc/src)

diff --git a/ext/libchdr-build/CMakeLists.txt b/ext/libchdr-build/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.0)
+cmake_minimum_required (VERSION 3.10.0)
 project (chdr)
 
 set(LZMA_DIR ../libchdr/deps/lzma-22.01/src)

diff --git a/ext/lua-build/CMakeLists.txt b/ext/lua-build/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.0)
+cmake_minimum_required (VERSION 3.10.0)
 project (lua)
 
 set(SRC_DIR ../lua)

diff --git a/ext/rcheevos-build/CMakeLists.txt b/ext/rcheevos-build/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.0)
+cmake_minimum_required (VERSION 3.10.0)
 project (RCheevos)
 
 set(SRC_DIR ../rcheevos/src)

diff --git a/ext/zstd-build/CMakeLists.txt b/ext/zstd-build/CMakeLists.txt
@@ -1,8 +1,7 @@
-cmake_minimum_required (VERSION 3.2.0)
+cmake_minimum_required (VERSION 3.10.0)
 project (libzstd_static)
 
 set(SRC_DIR ../zstd/lib)
-message(${SRC_DIR})
 
 set(ALL_SOURCE_FILES
 	${SRC_DIR}/common/debug.c