disabled static build by default

nesbox · May 11, 2024 · 9c64ca2 · 9c64ca2
1 parent f125e5c
commit 9c64ca2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,7 +32,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "tic80-winxp"
-          path: build/bin/tic80.exe
+          path: |
+            build/bin/tic80.exe
+            build/bin/*.dll
 
       - name: Build Pro
         shell: cmd
@@ -67,7 +69,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "tic80-windows"
-          path: build/bin/tic80.exe
+          path: |
+            build/bin/tic80.exe
+            build/bin/*.dll
 
       - name: Build Sokol
         shell: cmd
@@ -155,7 +159,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "tic80-linux"
-          path: build/bin/tic80
+          path: |
+            build/bin/tic80
+            build/bin/*.so
 
       - name: Build Pro
         run: |
@@ -373,7 +379,7 @@ jobs:
       - name: Build
         run: |
           cd build
-          cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SDLGPU=On ..
+          cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SDLGPU=On -DBUILD_WITH_ALL=ON ..
           cmake --build . --config $BUILD_TYPE --parallel
           cpack
           cp *.dmg tic80.dmg
@@ -388,7 +394,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "tic80-macos"
-          path: build/bin/tic80
+          path: |
+            build/bin/tic80
+            build/bin/*.dylib
 
       - name: Build
         run: |
@@ -412,7 +420,7 @@ jobs:
       - name: Build
         run: |
           cd build
-          cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SDLGPU=On ..
+          cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SDLGPU=On -DBUILD_WITH_ALL=ON ..
           cmake --build . --config $BUILD_TYPE --parallel
           cpack
           cp *.dmg tic80.dmg
@@ -427,7 +435,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "tic80-macos-arm64"
-          path: build/bin/tic80
+          path: |
+            build/bin/tic80
+            build/bin/*.dylib
 
       - name: Build
         run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,16 +18,18 @@ if(ANDROID OR EMSCRIPTEN OR N3DS OR RPI)
     set(BUILD_LIBRETRO_DEFAULT OFF)
     set(BUILD_PLAYER_DEFAULT OFF)
     set(BUILD_TOOLS OFF)
+    set(BUILD_STATIC_DEFAULT ON)
 else()
     set(BUILD_LIBRETRO_DEFAULT ON)
     set(BUILD_PLAYER_DEFAULT ON)
     set(BUILD_TOOLS ON)
+    set(BUILD_STATIC_DEFAULT OFF)
 endif()
 
 set(BUILD_TOUCH_INPUT_DEFAULT ${ANDROID})
 set(BUILD_WITH_ALL_DEFAULT OFF)
 
-option(BUILD_STATIC "Static runtime" ON)
+option(BUILD_STATIC "Static runtime" ${BUILD_STATIC_DEFAULT})
 option(BUILD_WITH_ALL "Build all supported scripts" ${BUILD_WITH_ALL_DEFAULT})
 option(BUILD_SDL "SDL Enabled" ON)
 option(BUILD_SDLGPU "SDL GPU Enabled" OFF)