| ... | @@ -194,7 +194,6 @@ include_directories(${CLANG_INCLUDE_DIRS}) | ... | @@ -194,7 +194,6 @@ include_directories(${CLANG_INCLUDE_DIRS}) |
| 194 | | 194 | |
| 195 | find_package(Threads) | 195 | find_package(Threads) |
| 196 | | 196 | |
| 197 | set(ZIG_LIB_DIR "lib/zig") | | |
| 198 | set(ZIG_CONFIG_H_OUT "${CMAKE_BINARY_DIR}/config.h") | 197 | set(ZIG_CONFIG_H_OUT "${CMAKE_BINARY_DIR}/config.h") |
| 199 | set(ZIG_CONFIG_ZIG_OUT "${CMAKE_BINARY_DIR}/config.zig") | 198 | set(ZIG_CONFIG_ZIG_OUT "${CMAKE_BINARY_DIR}/config.zig") |
| 200 | | 199 | |
| ... | @@ -722,29 +721,13 @@ include_directories( | ... | @@ -722,29 +721,13 @@ include_directories( |
| 722 | | 721 | |
| 723 | if(MSVC) | 722 | if(MSVC) |
| 724 | set(EXE_CXX_FLAGS "/std:c++17") | 723 | set(EXE_CXX_FLAGS "/std:c++17") |
| 725 | set(EXE_LDFLAGS "/STACK:16777216") | | |
| 726 | if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel") | | |
| 727 | set(EXE_LDFLAGS "${EXE_LDFLAGS} /debug:fastlink") | | |
| 728 | endif() | | |
| 729 | else() | 724 | else() |
| 730 | set(EXE_CXX_FLAGS "-std=c++17 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -Wno-type-limits -Wno-missing-braces -Wno-comment") | 725 | set(EXE_CXX_FLAGS "-std=c++17 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -Wno-type-limits -Wno-missing-braces -Wno-comment") |
| 731 | set(EXE_LDFLAGS " ") | | |
| 732 | if(MINGW) | 726 | if(MINGW) |
| 733 | set(EXE_CXX_FLAGS "${EXE_CXX_FLAGS} -Wno-format") | 727 | set(EXE_CXX_FLAGS "${EXE_CXX_FLAGS} -Wno-format") |
| 734 | set(EXE_LDFLAGS "${EXE_LDFLAGS} -Wl,--stack,16777216") | | |
| 735 | endif() | 728 | endif() |
| 736 | endif() | 729 | endif() |
| 737 | | 730 | |
| 738 | if(ZIG_STATIC) | | |
| 739 | if(APPLE) | | |
| 740 | set(EXE_LDFLAGS "${EXE_LDFLAGS} -static-libgcc -static-libstdc++") | | |
| 741 | elseif(MINGW) | | |
| 742 | set(EXE_LDFLAGS "${EXE_LDFLAGS} -static-libgcc -static-libstdc++ -Wl,-Bstatic, -lwinpthread -lz3 -lz -lgomp") | | |
| 743 | elseif(NOT MSVC) | | |
| 744 | set(EXE_LDFLAGS "${EXE_LDFLAGS} -static") | | |
| 745 | endif() | | |
| 746 | endif() | | |
| 747 | | | |
| 748 | add_library(zigcpp STATIC ${ZIG_CPP_SOURCES}) | 731 | add_library(zigcpp STATIC ${ZIG_CPP_SOURCES}) |
| 749 | if(ZIG_PIE) | 732 | if(ZIG_PIE) |
| 750 | set(ZIGCPP_CXX_FLAGS "${EXE_CXX_FLAGS} -fno-stack-protector -fPIC") | 733 | set(ZIGCPP_CXX_FLAGS "${EXE_CXX_FLAGS} -fno-stack-protector -fPIC") |