Maksytka/Vangers
1
1
Fork 0
mirror of https://github.com/KranX/Vangers.git synced 2025-11-30 23:15:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "At least use static std"

Browse Source
This commit is contained in:
Yury Zhuravlev
2020-07-23 12:11:43 +09:00
committed by GitHub
parent 0d0f0f51bf
commit 683960372d
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/vangers_windows_32_build.yml vendored
View File

@@ -63,7 +63,7 @@ jobs:
run: msys2do cmake -G Ninja ..
working-directory: build
- name: vangers -- make
run: msys2do cmake --build . --target vangers
run: msys2do ninja
working-directory: build
- name: vangers -- prepare release folder
run: |
@@ -77,6 +77,9 @@ jobs:
msys2do cp /mingw32/bin/libvorbis-0.dll vangers/bin/
msys2do cp /mingw32/bin/libvorbisfile-3.dll vangers/bin/
msys2do cp /mingw32/bin/zlib1.dll vangers/bin/
msys2do cp /mingw32/bin/libgcc_s_dw2-1.dll vangers/bin/
msys2do cp /mingw32/bin/libgcc_s_seh-1.dll vangers/bin/
msys2do cp /mingw32/bin/libstdc++-6.dll vangers/bin/
msys2do cp /mingw32/bin/libwinpthread-1.dll vangers/bin/
cp clunk/build/libclunk.dll vangers/bin/
cp build/src/vangers.exe vangers/bin/

5
.github/workflows/vangers_windows_64_build.yml vendored
View File

@@ -63,7 +63,7 @@ jobs:
run: msys2do cmake -G Ninja ..
working-directory: build
- name: vangers -- make
run: msys2do cmake --build . --target vangers
run: msys2do ninja
working-directory: build
- name: vangers -- prepare release folder
run: |
@@ -77,6 +77,9 @@ jobs:
msys2do cp /mingw64/bin/libvorbis-0.dll vangers/bin/
msys2do cp /mingw64/bin/libvorbisfile-3.dll vangers/bin/
msys2do cp /mingw64/bin/zlib1.dll vangers/bin/
msys2do cp /mingw64/bin/libgcc_s_dw2-1.dll vangers/bin/
msys2do cp /mingw64/bin/libgcc_s_seh-1.dll vangers/bin/
msys2do cp /mingw64/bin/libstdc++-6.dll vangers/bin/
msys2do cp /mingw64/bin/libwinpthread-1.dll vangers/bin/
cp clunk/build/libclunk.dll vangers/bin/
cp build/src/vangers.exe vangers/bin/

6
.gitignore vendored
View File

@@ -23,9 +23,3 @@ build/lib/utils/zip_convert.exe
.fuse_hidden*
.vscode/
*.code-workspace
# VS cmake
.vs/
[Oo]ut/
CMakeSettings.json

3
CMakeLists.txt
View File

@@ -17,7 +17,6 @@ OPTION(ACTINT "Actint user interface in road game" ON)
SET(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo")
IF(MINGW)
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
ENDIF()
set(CMAKE_CXX_STANDARD 14)
@@ -53,7 +52,7 @@ ENDIF(DIAGEN_TEST)
INCLUDE_DIRECTORIES(SYSTEM
${ZLIB_INCLUDE_DIR}
${SDL2_INCLUDE_DIR}
${SDL2_NET_INCLUDE_DIRS}
${SDL2_NET_INCLUDE_DIR}
${FFMPEG_INCLUDE_DIRS}
${CLUNK_INCLUDE_DIR}
${OGG_INCLUDE_DIR}