Allow cross-compiling from Linux with MinGW (Putnam3145#5)

* Fix miscapitalized headers * Remove extra qualifiers from method declarations * Move urmem calling convention specializations to a namespace Their current position is supported by MSVC but not GCC: https://stackoverflow.com/questions/2097811/ * Add CMake files for cross-compiling * Statically link libgcc and libstdc++ Co-Authored-By: steamport <[email protected]>
Doster-d · Nov 20, 2019 · f449f86 · f449f86
1 parent dc6f55d
commit f449f86
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 43 deletions.
diff --git a/byond-extools/CMakeLists.txt b/byond-extools/CMakeLists.txt
@@ -20,7 +20,11 @@ add_library(byond-extools SHARED ${SRC_FILES})
 source_group(TREE ${SRC_DIR} FILES ${SRC_FILES})
 if (WIN32)
     set_property(TARGET byond-extools PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-    target_compile_options(byond-extools PRIVATE "/MP")
+    if (MSVC)
+        target_compile_options(byond-extools PRIVATE "/MP")
+    else()
+        target_link_libraries(byond-extools PRIVATE "ws2_32" "psapi" "-static-libgcc" "-static-libstdc++" "-static")
+    endif()
     target_compile_definitions(byond-extools PRIVATE WIN32_LEAN_AND_MEAN)
     target_compile_definitions(byond-extools PRIVATE _WINSOCKAPI_)
 else()

diff --git a/byond-extools/cmake/i686-w64-mingw32.cmake b/byond-extools/cmake/i686-w64-mingw32.cmake
@@ -0,0 +1,18 @@
+set(GNU_HOST i686-w64-mingw32)
+set(CMAKE_SYSTEM_PROCESSOR "i686")
+
+set(COMPILER_PREFIX "${GNU_HOST}-")
+set(COMPILER_SUFFIX "-posix")
+
+set(CMAKE_SYSTEM_NAME "Windows")
+set(CMAKE_CROSSCOMPILING TRUE)
+set(WIN32 TRUE)
+set(MINGW TRUE)
+
+set(CMAKE_C_COMPILER ${COMPILER_PREFIX}gcc${COMPILER_SUFFIX})
+set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}g++${COMPILER_SUFFIX})
+set(CMAKE_RC_COMPILER ${COMPILER_PREFIX}windres)
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/byond-extools/dllmain.cpp b/byond-extools/dllmain.cpp
@@ -1,6 +1,6 @@
 // dllmain.cpp : Defines the entry point for the DLL application.
 #ifdef _WIN32
-#include <Windows.h>
+#include <windows.h>
 
 BOOL APIENTRY DllMain( HMODULE hModule,
                        DWORD  ul_reason_for_call,

diff --git a/byond-extools/src/core/sigscan/sigscan.cpp b/byond-extools/src/core/sigscan/sigscan.cpp
@@ -1,8 +1,8 @@
 #include "sigscan.h"
 
 #ifdef _WIN32
-#include <Windows.h>
-#include <Psapi.h>
+#include <windows.h>
+#include <psapi.h>
 #else
 // lol
 #include <dlfcn.h>

diff --git a/byond-extools/src/core/socket/socket.h b/byond-extools/src/core/socket/socket.h
@@ -7,7 +7,7 @@
 #ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <Windows.h>
+#include <windows.h>
 #pragma comment (lib, "Ws2_32")
 #endif
 
@@ -26,6 +26,6 @@ class SocketServer
 	bool listen_for_client();
 
 	bool send(std::string type, nlohmann::json content);
-	bool SocketServer::send(nlohmann::json j);
+	bool send(nlohmann::json j);
 	nlohmann::json recv_message();
 };
diff --git a/byond-extools/src/core/urmem.hpp b/byond-extools/src/core/urmem.hpp
@@ -17,22 +17,55 @@
 #include <memory>
 #include <mutex>
 
-class urmem {
-public:
+namespace urmem_invoker {
     using address_t = unsigned long;
-    using byte_t = unsigned char;
-    using bytearray_t = std::vector<byte_t>;
-
     enum class calling_convention {
         cdeclcall,
         stdcall,
         thiscall
     };
 
+#ifdef _WIN32
+    template<calling_convention>
+    struct invoker;
+
+    template<>
+    struct invoker<calling_convention::cdeclcall> {
+        template<typename Ret, typename ... Args>
+        static inline Ret call(address_t address, Args ... args) {
+            return (reinterpret_cast<Ret(__cdecl *)(Args...)>(address))(args...);
+        }
+    };
+
+    template<>
+    struct invoker<calling_convention::stdcall> {
+        template<typename Ret, typename ... Args>
+        static inline Ret call(address_t address, Args ... args) {
+            return (reinterpret_cast<Ret(__stdcall *)(Args...)>(address))(args...);
+        }
+    };
+
+    template<>
+    struct invoker<calling_convention::thiscall> {
+        template<typename Ret, typename ... Args>
+        static inline Ret call(address_t address, Args ... args) {
+            return (reinterpret_cast<Ret(__thiscall *)(Args...)>(address))(args...);
+        }
+    };
+#endif
+}
+
+class urmem {
+public:
+    using address_t = unsigned long;
+    using byte_t = unsigned char;
+    using bytearray_t = std::vector<byte_t>;
+    using calling_convention = urmem_invoker::calling_convention;
+
     template<calling_convention CConv = calling_convention::cdeclcall, typename Ret = void, typename ... Args>
     static Ret call_function(address_t address, Args ... args) {
 #ifdef _WIN32
-        return invoker<CConv>::template call<Ret, Args...>(address, args...);
+        return urmem_invoker::invoker<CConv>::template call<Ret, Args...>(address, args...);
 #else
         return (reinterpret_cast<Ret(*)(Args...)>(address))(args...);
 #endif
@@ -320,36 +353,6 @@ class urmem {
         address_t _original_addr{};
         std::shared_ptr<patch> _patch;
     };
-
-private:
-#ifdef _WIN32
-    template<calling_convention>
-    struct invoker;
-
-    template<>
-    struct invoker<calling_convention::cdeclcall> {
-        template<typename Ret, typename ... Args>
-        static inline Ret call(address_t address, Args ... args) {
-            return (reinterpret_cast<Ret(__cdecl *)(Args...)>(address))(args...);
-        }
-    };
-
-    template<>
-    struct invoker<calling_convention::stdcall> {
-        template<typename Ret, typename ... Args>
-        static inline Ret call(address_t address, Args ... args) {
-            return (reinterpret_cast<Ret(__stdcall *)(Args...)>(address))(args...);
-        }
-    };
-
-    template<>
-    struct invoker<calling_convention::thiscall> {
-        template<typename Ret, typename ... Args>
-        static inline Ret call(address_t address, Args ... args) {
-            return (reinterpret_cast<Ret(__thiscall *)(Args...)>(address))(args...);
-        }
-    };
-#endif
 };
 
 #endif // URMEM_H_
diff --git a/byond-extools/src/dmdism/disassembly.h b/byond-extools/src/dmdism/disassembly.h
@@ -14,7 +14,7 @@ class Disassembly
 	std::vector<int>* assemble();
 	Instruction& at(unsigned int i);
 	Instruction& at_offset(unsigned int offset);
-	Instruction* Disassembly::next_from_offset(unsigned int offset);
+	Instruction* next_from_offset(unsigned int offset);
 	int op_at(unsigned int i);
 	std::vector<Instruction>::iterator begin() noexcept;
 	std::vector<Instruction>::iterator end() noexcept;