Removed static linking of stdc++
Cause issues with std::locale
This commit is contained in:
parent
f93424ef77
commit
98cac71b2a
@ -1,6 +1,6 @@
|
|||||||
# CMakeLists.txt
|
# CMakeLists.txt
|
||||||
|
|
||||||
# Written by JackCarterSmith, 2024
|
# Written by JackCarterSmith, 2025
|
||||||
# This file is released under the ProtoTank license.
|
# This file is released under the ProtoTank license.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.23)
|
cmake_minimum_required(VERSION 3.23)
|
||||||
@ -107,11 +107,11 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# static linking of stdlib
|
# static linking of stdlib
|
||||||
if(MINGW)
|
#if(MINGW)
|
||||||
list(APPEND LINKLIBS -static gcc stdc++ pthread -dynamic)
|
# list(APPEND LINKLIBS -static gcc stdc++ pthread -dynamic)
|
||||||
else()
|
#else()
|
||||||
list(APPEND LINKLIBS -Wl,-Bstatic -lgcc -lstdc++ -lpthread -Wl,-Bdynamic)
|
# list(APPEND LINKLIBS -Wl,-Bstatic -lgcc -lstdc++ -lpthread -Wl,-Bdynamic)
|
||||||
endif()
|
#endif()
|
||||||
endif()
|
endif()
|
||||||
list(APPEND LINKLIBS ${EXTLIBS})
|
list(APPEND LINKLIBS ${EXTLIBS})
|
||||||
|
|
||||||
@ -119,7 +119,8 @@ target_compile_options(${PROJECT_NAME} PRIVATE ${COMPOPTS})
|
|||||||
target_link_options(${PROJECT_NAME} PRIVATE ${LINKOPTS})
|
target_link_options(${PROJECT_NAME} PRIVATE ${LINKOPTS})
|
||||||
target_link_libraries(${PROJECT_NAME} ${LINKLIBS})
|
target_link_libraries(${PROJECT_NAME} ${LINKLIBS})
|
||||||
|
|
||||||
|
# Linux file format patch
|
||||||
|
add_custom_target(format-patch COMMAND dos2unix `git ls-files` WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
|
||||||
|
|
||||||
# GPG signature custom command
|
# GPG signature custom command
|
||||||
#add_custom_command(
|
#add_custom_command(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user