forked from Ports/perfect_dark
port: cmake: fix stdc++ linking on windows; restore the icon
This commit is contained in:
1 parent
6c8e5ee4dc
commit
1d7c381ce2
1 file changed
+6
-2
+6
-2
@@ -204,9 +204,9 @@ list(APPEND LIBS "${GL_LIBRARY}")
|
||||
# Platform-specific extra libs
|
||||
if(NOT EXTRA_LIBRARIES)
|
||||
if(WIN32)
|
||||
set(EXTRA_LIBRARIES dbghelp)
|
||||
set(EXTRA_LIBRARIES dbghelp -static-libstdc++)
|
||||
else()
|
||||
set(EXTRA_LIBRARIES m dl)
|
||||
set(EXTRA_LIBRARIES stdc++ m dl)
|
||||
endif()
|
||||
endif()
|
||||
list(APPEND LIBS "${EXTRA_LIBRARIES}")
|
||||
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user