Merge branch 'main' of https://github.com/DrAbcOfficial/asexthook

DrAbcOfficial · Aug 8, 2023 · 386fb36 · 386fb36
2 parents ede514e + a5803d8
commit 386fb36
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -66,10 +66,10 @@ jobs:
 
     - name: Build
       working-directory: ${{env.SOLUTION_FILE_PATH}}
-      run: mkdir build && cd build && cmake -DCMAKE_CONFIGURATION_TYPES="Release" .. && make
+      run: mkdir build && cd build && cmake .. && make
 
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v3.1.0
       with:
         name: asexthook.so
-        path: ${{env.SOLUTION_FILE_PATH}}/build/libasexthook.so
+        path: ${{env.SOLUTION_FILE_PATH}}/Release/libasexthook.so
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -73,12 +73,12 @@ jobs:
 
     - name: Build
       working-directory: ${{env.SOLUTION_FILE_PATH}}
-      run: mkdir build && cd build && cmake -DCMAKE_CONFIGURATION_TYPES="Release" .. && make && mv libasexthook.so asexthook.so
+      run: mkdir build && cd build && cmake .. && make && mv ../Release/libasexthook.so ../Release/asexthook.so
 
     - name: Zipping All
       uses: vimtor/action-zip@v1
       with:
-          files: ${{env.SOLUTION_FILE_PATH}}/build/asexthook.so
+          files: ${{env.SOLUTION_FILE_PATH}}/Release/asexthook.so
           dest: asexthook-ubuntu-i386.zip
 
     - name: Create Release

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,5 @@
 cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
 
-set(CMAKE_SYSTEM_VERSION $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) CACHE STRING "" FORCE)
-
-set (CMAKE_CXX_STANDARD 20)
-set (CMAKE_CXX_STANDARD_REQUIRED ON)
-
 project(asexthook C CXX)
 
 ################################################################################
@@ -31,12 +26,19 @@ set(CMAKE_CONFIGURATION_TYPES
 ################################################################################
 # Global compiler options
 ################################################################################
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_BUILD_TYPE Release)
+
 set(CMAKE_C_FLAGS "-m32")
 set(CMAKE_C_FLAGS_DEBUG "-m32")
-set(CMAKE_C_FLAGS_RELEASE "-m32")
+set(CMAKE_C_FLAGS_RELEASE "-m32 -Os -ffunction-sections")
 set(CMAKE_CXX_FLAGS "-m32")
 set(CMAKE_CXX_FLAGS_DEBUG "-m32")
-set(CMAKE_CXX_FLAGS_RELEASE "-m32")
+set(CMAKE_CXX_FLAGS_RELEASE "-m32 -Os -ffunction-sections")
+
+set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "-s -Wl,--as-needed")
 
 ################################################################################
 # Global linker options
@@ -219,18 +221,5 @@ if(MSVC)
         >
         /DEBUG
     )
-else()
-	set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
-    	set(CMAKE_CXX_FLAGS_RELEASE "-Os")
 endif()
 
-################################################################################
-# Post build events
-################################################################################
-add_custom_command_if(
-    TARGET ${PROJECT_NAME}
-    POST_BUILD
-    COMMANDS
-    COMMAND $<CONFIG:Release> copy "$<SHELL_PATH:${OUTPUT_DIRECTORY}>${TARGET_NAME}$ENV{TargetExt}" "$<SHELL_PATH:${CMAKE_CURRENT_SOURCE_DIR}/>/../build/addons/metamod/dlls/"
-)
-