Merge with master
This commit is contained in:
commit
81774b55f0
BIN
Adventures in Lestoria/assets/molotov.png
Normal file
BIN
Adventures in Lestoria/assets/molotov.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 726 B |
@ -284,6 +284,12 @@ if(UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND NOT TEST_ONLY)
|
||||
add_library( libsteam_api SHARED IMPORTED )
|
||||
set_property(TARGET libsteam_api PROPERTY IMPORTED_LOCATION "Adventures in Lestoria/libsteam_api.so")
|
||||
|
||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14)
|
||||
target_link_libraries(${OutputExecutable} stdc++exp)
|
||||
else()
|
||||
target_link_libraries(${OutputExecutable} stdc++_libbacktrace)
|
||||
endif()
|
||||
|
||||
target_link_libraries(${OutputExecutable} discord_game_sdk)
|
||||
target_link_libraries(${OutputExecutable} libsteam_api)
|
||||
target_link_libraries(${OutputExecutable} dl)
|
||||
@ -332,7 +338,7 @@ if(UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND TEST_ONLY)
|
||||
target_link_options(
|
||||
AiL_test
|
||||
PRIVATE
|
||||
-static-libstdc++
|
||||
-static-libstdc++
|
||||
"Adventures in Lestoria/discord_game_sdk.so"
|
||||
"Adventures in Lestoria/libsteam_api.so")
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
rm CMakeCache.txt
|
||||
git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
|
||||
cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release .;make -j 8
|
||||
cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release .;make -j$(nproc)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user