From fdd83bd0f8633ca0e890f745143c6b6335250009 Mon Sep 17 00:00:00 2001 From: scawful Date: Wed, 7 Aug 2024 13:55:57 -0400 Subject: [PATCH] update asar.cmake, add CXX flags for compilation --- CMakeLists.txt | 1 + cmake/asar.cmake | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d3428b8d..b067934c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) set(BUILD_SHARED_LIBS OFF) set(CMAKE_FIND_FRAMEWORK LAST) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dlinux -Dstricmp=strcasecmp") # Abseil Standard Specifications include(cmake/absl.cmake) diff --git a/cmake/asar.cmake b/cmake/asar.cmake index 278a264a..bb31d67a 100644 --- a/cmake/asar.cmake +++ b/cmake/asar.cmake @@ -7,27 +7,27 @@ set(ASAR_GEN_EXE_TEST OFF) set(ASAR_GEN_DLL_TEST OFF) set(ASAR_STATIC_SRC - "../src/lib/asar/src/asar/interface-lib.cpp" - "../src/lib/asar/src/asar/addr2line.cpp" - "../src/lib/asar/src/asar/arch-65816.cpp" - "../src/lib/asar/src/asar/arch-spc700.cpp" - "../src/lib/asar/src/asar/arch-superfx.cpp" - "../src/lib/asar/src/asar/assembleblock.cpp" - "../src/lib/asar/src/asar/crc32.cpp" - "../src/lib/asar/src/asar/libcon.cpp" - "../src/lib/asar/src/asar/libsmw.cpp" - "../src/lib/asar/src/asar/libstr.cpp" - "../src/lib/asar/src/asar/macro.cpp" - "../src/lib/asar/src/asar/main.cpp" - "../src/lib/asar/src/asar/asar_math.cpp" - "../src/lib/asar/src/asar/virtualfile.cpp" - "../src/lib/asar/src/asar/warnings.cpp" - "../src/lib/asar/src/asar/errors.cpp" - "../src/lib/asar/src/asar/platform/file-helpers.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/interface-lib.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/addr2line.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/arch-65816.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/arch-spc700.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/arch-superfx.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/assembleblock.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/crc32.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/libcon.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/libsmw.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/libstr.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/macro.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/main.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/asar_math.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/virtualfile.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/warnings.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/errors.cpp" + "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/platform/file-helpers.cpp" ) if(WIN32 OR MINGW) - list(APPEND ASAR_STATIC_SRC "../src/lib/asar/src/asar/platform/windows/file-helpers-win32.cpp") + list(APPEND ASAR_STATIC_SRC "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/platform/windows/file-helpers-win32.cpp") else() - list(APPEND ASAR_STATIC_SRC "../src/lib/asar/src/asar/platform/linux/file-helpers-linux.cpp") + list(APPEND ASAR_STATIC_SRC "${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar/platform/linux/file-helpers-linux.cpp") endif() \ No newline at end of file