Skip to content

Commit

Permalink
Merge branch 'port' of https://github.com/fgsfdsfgs/perfect_dark into…
Browse files Browse the repository at this point in the history
… port-net
  • Loading branch information
fgsfdsfgs committed Nov 13, 2024
2 parents 8b8eedc + 1d7c381 commit 3ff2f9e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ list(APPEND LIBS "${GL_LIBRARY}")
# Platform-specific extra libs
if(NOT EXTRA_LIBRARIES)
if(WIN32)
set(EXTRA_LIBRARIES ws2_32 winmm dbghelp)
set(EXTRA_LIBRARIES ws2_32 winmm dbghelp -static-libstdc++)
else()
set(EXTRA_LIBRARIES m dl)
set(EXTRA_LIBRARIES stdc++ m dl)
endif()
endif()
list(APPEND LIBS "${EXTRA_LIBRARIES}")
Expand Down Expand Up @@ -279,6 +279,10 @@ set(SRC
${SRC_LIB}
)

if(WIN32)
list(APPEND SRC "${CMAKE_SOURCE_DIR}/dist/windows/icon.rc")
endif()

# Asset files

generate_asset_headers("lang/" "${CMAKE_SOURCE_DIR}/tools/assetmgr/mklang" "en" JSON_HEADERS)
Expand Down

0 comments on commit 3ff2f9e

Please sign in to comment.