mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-01 09:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69 from xTVaser/cmake-pprint-workaround

Browse Source 
Fix CMake/NASM issue on windows caused by spdlog.  Temporarily workaround slow pprint test
This commit is contained in:
water111
2020-10-08 23:55:06 -04:00
committed by GitHub
parent a64dd6c90b 274418f12a
commit adc09d7c79
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/CMakeLists.txt
+1 -1
View File
@@ -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 "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
set_source_files_properties(kernel/asm_funcs.asm PROPERTIES COMPILE_FLAGS "-g")
set(RUNTIME_SOURCE
runtime.cpp
test/test_pretty_print.cpp
+1 -1
View File
@@ -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()