fix msys2 build

liberty/Makefile

@@ -310,7 +310,7 @@ texconv: $(OBJS_TEXCONV) | pvrtex # You'll have to rebuild pvrtex manually if yo
 	$(CXX) -o $@ $(OBJS_TEXCONV)
 
 %.texconv.o: %.cpp
-	$(CXX) -std=c++2a -c -O3 -g -MMD -MP -o $@ -I../vendor/koshle -I../vendor/librw/src $(INCLUDE) -I../vendor/emu -I../vendor/crypto -I../vendor/TriStripper/include $(DEFINES) -DDC_TEXCONV -DDC_SIM -D_INC_WINDOWS $(TEXCONV_FLAGS) $<
+	$(CXX) -std=c++2a -c -O3 -g -MMD -MP -o $@ -I../vendor/koshle -I../vendor/librw/src $(INCLUDE) -I../vendor/emu -I../vendor/crypto -I../vendor/TriStripper/include $(DEFINES) -DDC_TEXCONV -DDC_SIM $(TEXCONV_FLAGS) $<
 
 animtool: ../src/tools/animtool.cpp
 	$(CXX) -std=c++17 -o $@ -g -O0 $<

src/liberty/skel/crossplatform.h

@@ -13,9 +13,7 @@ enum eWinVersion
     OS_WINXP,
 };
 
-#ifdef _WIN64
-#include <windows.h>
-#elif defined(_WIN32)
+#ifdef _WIN32
 
 // As long as WITHWINDOWS isn't defined / <Windows.h> isn't included, we only need type definitions so let's include <IntSafe.h>.
 // NOTE: It's perfectly fine to include <Windows.h> here, but it can increase build size and time in *some* conditions, and maybe substantially in future if we'll use crossplatform.h more.

src/miami/skel/crossplatform.h

@@ -17,7 +17,7 @@ enum eWinVersion
 char *_strdate(char *buf);
 #endif
 
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32
 
 // As long as WITHWINDOWS isn't defined / <Windows.h> isn't included, we only need type definitions so let's include <IntSafe.h>.
 // NOTE: It's perfectly fine to include <Windows.h> here, but it can increase build size and time in *some* conditions, and maybe substantially in future if we'll use crossplatform.h more.

vendor/koshle/dc_hle_types.h

@@ -1,27 +1,6 @@
 #pragma once
 
-#if defined(_WIN64) && _WIN64 == 1
-    typedef unsigned long long uint64;  /**< \brief 64-bit unsigned integer */
-    typedef unsigned int uint32;       /**< \brief 32-bit unsigned integer */
-    typedef unsigned short uint16;      /**< \brief 16-bit unsigned integer */
-    typedef unsigned char uint8;        /**< \brief 8-bit unsigned integer */
-    typedef long long int64;            /**< \brief 64-bit signed integer */
-    typedef int int32;                 /**< \brief 32-bit signed integer */
-    typedef short int16;                /**< \brief 16-bit signed integer */
-    typedef char int8;                  /**< \brief 8-bit signed integer */ 
-
-    typedef volatile unsigned long long vuint64;  /**< \brief 64-bit unsigned integer */
-    typedef volatile unsigned int vuint32;       /**< \brief 32-bit unsigned integer */
-    typedef volatile unsigned short vuint16;      /**< \brief 16-bit unsigned integer */
-    typedef volatile unsigned char vuint8;        /**< \brief 8-bit unsigned integer */
-    typedef volatile long long vint64;            /**< \brief 64-bit signed integer */
-    typedef volatile int vint32;                 /**< \brief 32-bit signed integer */
-    typedef volatile short vint16;                /**< \brief 16-bit signed integer */
-    typedef volatile char vint8;                  /**< \brief 8-bit signed integer */ 
-
-typedef uint64 ptr_t;
-#define INT32_IS_INT
-#elif (( (__LONG_MAX__ *2UL+1UL) == 18446744073709551615ULL) && ((__INT_MAX__  *2U +1U) == 4294967295ULL))
+#if ( (__LONG_MAX__ *2UL+1UL) == 18446744073709551615ULL) && ((__INT_MAX__  *2U +1U) == 4294967295ULL)
 typedef unsigned long uint64;  /**< \brief 64-bit unsigned integer */
 typedef unsigned int uint32;       /**< \brief 32-bit unsigned integer */
 typedef unsigned short uint16;      /**< \brief 16-bit unsigned integer */
@@ -40,7 +19,6 @@ typedef volatile int vint32;                 /**< \brief 32-bit signed integer *
 typedef volatile short vint16;                /**< \brief 16-bit signed integer */
 typedef volatile char vint8;                  /**< \brief 8-bit signed integer */ 
 
-typedef uint64 ptr_t;
 #define INT32_IS_INT
 #elif ((__LONG_LONG_MAX__*2ULL+1ULL) == 18446744073709551615ULL) && ((__LONG_MAX__ *2UL+1UL) == 4294967295ULL)
 // These are -m32 specific and try to follow KOS rules
@@ -62,11 +40,16 @@ typedef volatile long vint32;                 /**< \brief 32-bit signed integer
 typedef volatile short vint16;                /**< \brief 16-bit signed integer */
 typedef volatile char vint8;                  /**< \brief 8-bit signed integer */ 
 
-typedef uint32 ptr_t;
 #else
 #error "Unable to detect basic types" 
 #endif
 
+#if __SIZEOF_POINTER__ == 4
+typedef uint32 ptr_t;
+#else
+typedef uint64 ptr_t;
+#endif
+
 static_assert(sizeof(uint64) == 8, "uint64 size is not 8 bytes");
 static_assert(sizeof(uint32) == 4, "uint32 size is not 4 bytes");
 static_assert(sizeof(uint16) == 2, "uint16 size is not 2 bytes");

vendor/librw/src/dc/rwdc.cpp

@@ -4527,10 +4527,6 @@ imageFindRasterFormat(Image *img, int32 type,
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h> // For QueryPerformanceCounter and GetCurrentThreadId
-#ifdef _WIN64
-#include <profileapi.h>
-#include <processthreadsapi.h>
-#endif
 #elif defined(__APPLE__)
 #include <mach/mach_time.h> // For mach_absolute_time
 #include <pthread.h>