Fix incorrect compile flags

tishion · Dec 13, 2021 · f564c35 · f564c35
1 parent 119f516
commit f564c35
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,11 +48,8 @@ set(CMAKE_CONFIGURATION_TYPES Debug Release)
 
 # Default compile flags
 # Thanks for the PR https://github.com/microsoft/vcpkg/pull/15151/files from https://github.com/BillyONeal
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS-"
-    CACHE STRING "default C++ compile flags" FORCE)
-set(CMAKE_C_FLAGS
-    "${CMAKE_C_FLAGS} /GS-"
-     CACHE STRING "default C++ compile flags" FORCE)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS-")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /GS-")
 
 message(STATUS "CMAKE_CXX_FLAGS=" ${CMAKE_CXX_FLAGS})
 message(STATUS "CMAKE_CXX_FLAGS_DEBUG=" ${CMAKE_CXX_FLAGS_DEBUG})

diff --git a/tools/shellcode-generator/CMakeLists.txt b/tools/shellcode-generator/CMakeLists.txt
@@ -10,6 +10,23 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     Shlwapi
 )
 
+# remove /RTC* from compile flags 
+foreach(flag_var
+        CMAKE_CXX_FLAGS 
+        CMAKE_CXX_FLAGS_DEBUG 
+        CMAKE_CXX_FLAGS_RELEASE
+        CMAKE_C_FLAGS 
+        CMAKE_C_FLAGS_DEBUG 
+        CMAKE_C_FLAGS_RELEASE
+)
+    STRING (REGEX REPLACE "/RTC[^ ]*" "" ${flag_var} "${${flag_var}}")
+endforeach(flag_var)
+
+# enable function ordering 
+target_compile_options(${PROJECT_NAME} PRIVATE
+    /Gy
+)
+
 target_link_options(${PROJECT_NAME} PRIVATE
     /OPT:NOREF
     /OPT:NOICF

diff --git a/tools/shellcode-generator/functionorder b/tools/shellcode-generator/functionorder
@@ -13,7 +13,7 @@ MapMemModuleSections
 RelocateModuleBase
 ResolveImportTable
 SetMemProtectStatus
-ExecuteTLSCallback
+HandleTlsData
 CallModuleEntry
 GetExportedProcAddress
 UnmapMemModule