From e7e844dfad39c3124684a5b8e84c684463fae9b2 Mon Sep 17 00:00:00 2001
From: MoneroOcean <support@moneroocean.stream>
Date: Tue, 18 Jun 2019 16:35:39 -0700
Subject: [PATCH 1/4] Windows build fix

---
 RandomX/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RandomX/CMakeLists.txt b/RandomX/CMakeLists.txt
index 837de9f1..bfb4ca61 100644
--- a/RandomX/CMakeLists.txt
+++ b/RandomX/CMakeLists.txt
@@ -59,6 +59,8 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif()
 
+message ("${ARCH_ID}")
+
 if (ARCH_ID STREQUAL "x86_64" OR ARCH_ID STREQUAL "x86-64" OR ARCH_ID STREQUAL "amd64")
   list(APPEND randomx_sources
     src/jit_compiler_x86_static.S

From a7746af684e9552ae1a244d2b84c267e9cd1c7d8 Mon Sep 17 00:00:00 2001
From: MoneroOcean <support@moneroocean.stream>
Date: Tue, 18 Jun 2019 16:40:31 -0700
Subject: [PATCH 2/4] Windows build fix

---
 RandomX/CMakeLists.txt | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/RandomX/CMakeLists.txt b/RandomX/CMakeLists.txt
index bfb4ca61..04dd2c09 100644
--- a/RandomX/CMakeLists.txt
+++ b/RandomX/CMakeLists.txt
@@ -27,7 +27,6 @@
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 cmake_minimum_required(VERSION 2.8.7)
-project(RandomX)
 
 set (randomx_sources
 src/aes_hash.cpp
@@ -59,8 +58,6 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif()
 
-message ("${ARCH_ID}")
-
 if (ARCH_ID STREQUAL "x86_64" OR ARCH_ID STREQUAL "x86-64" OR ARCH_ID STREQUAL "amd64")
   list(APPEND randomx_sources
     src/jit_compiler_x86_static.S
@@ -69,6 +66,15 @@ if (ARCH_ID STREQUAL "x86_64" OR ARCH_ID STREQUAL "x86-64" OR ARCH_ID STREQUAL "
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
 endif()
 
+if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MT")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MT")
+  add_definitions(/UUNICODE)
+  list(APPEND randomx_sources
+    src/jit_compiler_x86_static.asm
+    src/jit_compiler_x86.cpp)
+endif()
+
 set(RANDOMX_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "RandomX Include path")
 
 add_library(randomx
@@ -81,11 +87,3 @@ set_property(TARGET randomx PROPERTY CXX_STANDARD 11)
 
 # cheat because cmake and ccache hate each other
 set_property(SOURCE src/jit_compiler_x86_static.S PROPERTY LANGUAGE C)
-
-message ("${CMAKE_CXX_COMPILER_ID}")
-
-if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MT")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MT")
-  add_definitions(/UUNICODE)
-endif()

From 8bc932bd5b4394dcd62326db8f6ba3624016308b Mon Sep 17 00:00:00 2001
From: MoneroOcean <support@moneroocean.stream>
Date: Tue, 18 Jun 2019 16:49:41 -0700
Subject: [PATCH 3/4] Windows build fix

---
 RandomX/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RandomX/CMakeLists.txt b/RandomX/CMakeLists.txt
index 04dd2c09..7a087d39 100644
--- a/RandomX/CMakeLists.txt
+++ b/RandomX/CMakeLists.txt
@@ -82,7 +82,7 @@ add_library(randomx
 target_link_libraries(randomx
   PRIVATE
     ${CMAKE_THREAD_LIBS_INIT})
-set_property(TARGET randomx PROPERTY POSITION_INDEPENDENT_CODE ON)
+# set_property(TARGET randomx PROPERTY POSITION_INDEPENDENT_CODE ON)
 set_property(TARGET randomx PROPERTY CXX_STANDARD 11)
 
 # cheat because cmake and ccache hate each other

From d9b8b54bfbc2f41e5db83a8567f298ff56bd98c1 Mon Sep 17 00:00:00 2001
From: MoneroOcean <support@moneroocean.stream>
Date: Tue, 18 Jun 2019 16:56:04 -0700
Subject: [PATCH 4/4] Windows build fix

---
 RandomX/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/RandomX/CMakeLists.txt b/RandomX/CMakeLists.txt
index 7a087d39..fa0967c1 100644
--- a/RandomX/CMakeLists.txt
+++ b/RandomX/CMakeLists.txt
@@ -67,8 +67,8 @@ if (ARCH_ID STREQUAL "x86_64" OR ARCH_ID STREQUAL "x86-64" OR ARCH_ID STREQUAL "
 endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MT")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MT")
+  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} /MT")
+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} /MT")
   add_definitions(/UUNICODE)
   list(APPEND randomx_sources
     src/jit_compiler_x86_static.asm
@@ -82,7 +82,7 @@ add_library(randomx
 target_link_libraries(randomx
   PRIVATE
     ${CMAKE_THREAD_LIBS_INIT})
-# set_property(TARGET randomx PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_property(TARGET randomx PROPERTY POSITION_INDEPENDENT_CODE ON)
 set_property(TARGET randomx PROPERTY CXX_STANDARD 11)
 
 # cheat because cmake and ccache hate each other