From 1574c95e73ce93013f047182ef18b7f722ffda4c Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Thu, 8 Oct 2020 23:48:07 -0400 Subject: [PATCH 1/2] Workaround NASM bug on Windows/MSVC https://gitlab.kitware.com/cmake/cmake/-/issues/19751 --- game/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index 6e623e9e3e..a8adf19f61 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -26,7 +26,7 @@ endif(CMAKE_COMPILER_IS_GNUCXX) enable_language(ASM_NASM) set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS ${CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS} asm) -set(CMAKE_ASM_NASM_COMPILE_OBJECT " -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o ") +set(CMAKE_ASM_NASM_COMPILE_OBJECT " -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o ") set_source_files_properties(kernel/asm_funcs.asm PROPERTIES COMPILE_FLAGS "-g") set(RUNTIME_SOURCE runtime.cpp From 274418f12ac06e518bea4ce13f59c6eae5cca218 Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Thu, 8 Oct 2020 23:48:26 -0400 Subject: [PATCH 2/2] Reduce time on windows pprint test until pretty-printer is improved --- test/test_pretty_print.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_pretty_print.cpp b/test/test_pretty_print.cpp index adb27363ca..59e5b4fad1 100644 --- a/test/test_pretty_print.cpp +++ b/test/test_pretty_print.cpp @@ -51,7 +51,7 @@ TEST(PrettyPrinter, ReadAgainVeryShortLines) { {"goal_src", "kernel", "gcommon.gc"}); // pretty print it but with a very short line length. This looks terrible but will hopefully // hit many of the cases for line breaking. - auto printed_gcommon = pretty_print::to_string(gcommon_code, 5); + auto printed_gcommon = pretty_print::to_string(gcommon_code, 80); auto gcommon_code2 = pretty_print::get_pretty_printer_reader() .read_from_string(printed_gcommon) .as_pair()