authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-06-22 23:51:21-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2019-06-22 23:51:21-04:00
log9153b17c922e3166a824d300781ca4e6da015787
tree566bb0a6bc336debf1e4ddeffcc49435c3b4967a
parent987c209b407f8379fd58381dcd3975982dfccdaf
parentf1c57a7f84130b1fb967913c98a5d8547f898c5b
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #2733 from emekoi/write-strings

various fixes for mingw

2 files changed, 8 insertions(+), 10 deletions(-)

CMakeLists.txt+7-9
...@@ -6,7 +6,7 @@ if(NOT CMAKE_BUILD_TYPE)...@@ -6,7 +6,7 @@ if(NOT CMAKE_BUILD_TYPE)
6endif()6endif()
77
8if(NOT CMAKE_INSTALL_PREFIX)8if(NOT CMAKE_INSTALL_PREFIX)
9 set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}" CACHE STRING9 set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}" CACHE STRING
10 "Directory to install zig to" FORCE)10 "Directory to install zig to" FORCE)
11endif()11endif()
1212
...@@ -6595,7 +6595,7 @@ set(ZIG_LIBCXX_FILES...@@ -6595,7 +6595,7 @@ set(ZIG_LIBCXX_FILES
65956595
6596if(MSVC)6596if(MSVC)
6597 set(MSVC_DIA_SDK_DIR "$ENV{VSINSTALLDIR}DIA SDK")6597 set(MSVC_DIA_SDK_DIR "$ENV{VSINSTALLDIR}DIA SDK")
6598 if (IS_DIRECTORY ${MSVC_DIA_SDK_DIR})6598 if(IS_DIRECTORY ${MSVC_DIA_SDK_DIR})
6599 set(ZIG_DIA_GUIDS_LIB "${MSVC_DIA_SDK_DIR}/lib/amd64/diaguids.lib")6599 set(ZIG_DIA_GUIDS_LIB "${MSVC_DIA_SDK_DIR}/lib/amd64/diaguids.lib")
6600 string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_DIA_GUIDS_LIB_ESCAPED "${ZIG_DIA_GUIDS_LIB}")6600 string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_DIA_GUIDS_LIB_ESCAPED "${ZIG_DIA_GUIDS_LIB}")
6601 endif()6601 endif()
...@@ -6634,20 +6634,18 @@ set(EXE_CFLAGS "-std=c++11")...@@ -6634,20 +6634,18 @@ set(EXE_CFLAGS "-std=c++11")
6634if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")6634if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
6635 if(MSVC)6635 if(MSVC)
6636 set(EXE_CFLAGS "${EXE_CFLAGS} /w")6636 set(EXE_CFLAGS "${EXE_CFLAGS} /w")
6637 elseif(MINGW)
6638 set(EXE_CFLAGS "${EXE_CFLAGS} -Wall -Werror -Wno-error=format= -Wno-error=format -Wno-error=format-extra-args")
6639 else()6637 else()
6640 set(EXE_CFLAGS "${EXE_CFLAGS} -Werror -Wall")6638 set(EXE_CFLAGS "${EXE_CFLAGS} -Werror -Wall")
6641 endif()6639 endif()
6642endif()6640endif()
66436641
6644if(MSVC)6642if(MSVC)
6645 set(EXE_CFLAGS "${EXE_CFLAGS}")6643 set(EXE_CFLAGS "${EXE_CFLAGS}")
6646else()6644else()
6647 set(EXE_CFLAGS "${EXE_CFLAGS} -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -Werror=strict-prototypes -Werror=old-style-definition -Werror=type-limits -Wno-missing-braces")6645 set(EXE_CFLAGS "${EXE_CFLAGS} -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -Werror=strict-prototypes -Werror=old-style-definition -Werror=type-limits -Wno-missing-braces")
6648 if(MINGW)6646 if(MINGW)
6649 set(EXE_CFLAGS "${EXE_CFLAGS} -D__USE_MINGW_ANSI_STDIO -Wno-pedantic-ms-format")6647 set(EXE_CFLAGS "${EXE_CFLAGS} -Wno-format")
6650 endif()6648 endif()
6651endif()6649endif()
66526650
6653set(OPTIMIZED_C_FLAGS "-std=c99 -O3")6651set(OPTIMIZED_C_FLAGS "-std=c99 -O3")
src/os.cpp+1-1
...@@ -128,7 +128,7 @@ static void os_spawn_process_posix(ZigList<const char *> &args, Termination *ter...@@ -128,7 +128,7 @@ static void os_spawn_process_posix(ZigList<const char *> &args, Termination *ter
128128
129static void os_windows_create_command_line(Buf *command_line, ZigList<const char *> &args) {129static void os_windows_create_command_line(Buf *command_line, ZigList<const char *> &args) {
130 buf_resize(command_line, 0);130 buf_resize(command_line, 0);
131 char *prefix = "\"";131 const char *prefix = "\"";
132 for (size_t arg_i = 0; arg_i < args.length; arg_i += 1) {132 for (size_t arg_i = 0; arg_i < args.length; arg_i += 1) {
133 const char *arg = args.at(arg_i);133 const char *arg = args.at(arg_i);
134 buf_append_str(command_line, prefix);134 buf_append_str(command_line, prefix);