From 8c32994d4f5e4afe727dd2d2201439b83e6dcd97 Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Fri, 6 Oct 2023 22:10:55 +0000 Subject: [PATCH] Fix windows exe generation (#2) MinGW is not respecting the BUILD_SHARED_LIBS default value. Cool! Reviewed-on: https://gitea.moonside.games/MoonsideGames/Cram/pulls/2 --- .drone.yml | 2 +- CMakeLists.txt | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5e87878..8dcc844 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: commands: - cmake -E make_directory ./windows-build - cd ./windows-build - - mingw64-cmake -S .. -B . + - mingw64-cmake -DBUILD_SHARED_LIBS=OFF -S .. -B . - make - name: gitea_release diff --git a/CMakeLists.txt b/CMakeLists.txt index e91bccf..9528b10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,12 @@ if(BUILD_SHARED_LIBS) set(LINKSTYLE PUBLIC) endif() +if(BUILD_SHARED_LIBS) + add_library(Cram SHARED ${SOURCE_FILES}) +else() + add_library(Cram STATIC ${SOURCE_FILES}) +endif() + if(BUILD_CLI) file(GLOB CLI_SOURCES tools/cli/lib/stb_image_write.h @@ -80,11 +86,6 @@ if(BUILD_CLI) endif() endif() -if(BUILD_SHARED_LIBS) - add_library(Cram SHARED ${SOURCE_FILES}) -else() - add_library(Cram STATIC ${SOURCE_FILES}) -endif() # Build flags if(NOT MSVC)