From cf0923504094f2af72cabece7de29d3420818d1f Mon Sep 17 00:00:00 2001 From: Dane Johnson Date: Sun, 25 Apr 2021 16:04:26 -0500 Subject: [PATCH] Changes to build natively on windows (using mingw-w64 toolchain) --- CMakeLists.txt | 1 - shaders/makeheaders.pl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bff3b9..22a151f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,6 @@ target_include_directories(couchlib file(COPY LICENSE CORRESPONDINGSOURCE.txt DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") if(WIN32) - target_link_libraries(couch glfw3dll) target_link_libraries(couch ssp) set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++") endif(WIN32) diff --git a/shaders/makeheaders.pl b/shaders/makeheaders.pl index b206951..742e7c2 100644 --- a/shaders/makeheaders.pl +++ b/shaders/makeheaders.pl @@ -16,7 +16,7 @@ open my $fout, '>', $outfilename; print $fout "#ifndef $headerguard \n#define $headerguard\nconst char * $constname = \n"; while(my $line = <$fin>) { - $line =~ s/\n/\\n/; + $line =~ s/(\r?\n)/\\n/; print $fout "\"$line\"\n"; }