scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake improvements

Browse Source
This commit is contained in:
Justin Scofield
2022-09-18 09:37:37 -05:00
parent 83e048ef5f
commit 01f1bf9e1d
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/asar.cmake
View File

@@ -24,5 +24,10 @@ set(ASAR_STATIC_SRC
"../src/lib/asar/src/asar/warnings.cpp" "../src/lib/asar/src/asar/warnings.cpp"
"../src/lib/asar/src/asar/errors.cpp" "../src/lib/asar/src/asar/errors.cpp"
"../src/lib/asar/src/asar/platform/file-helpers.cpp" "../src/lib/asar/src/asar/platform/file-helpers.cpp"
"../src/lib/asar/src/asar/platform/linux/file-helpers-linux.cpp" )
)
if(WIN32 OR MINGW)
list(APPEND ASAR_STATIC_SRC "../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")
endif()

8
cmake/openssl.cmake
View File

@@ -1,3 +1,5 @@
set(OPENSSL_INCLUDE_DIR "/usr/local/Cellar/openssl@1.1/1.1.1q/include") if (UNIX)
set(OPENSSL_CRYPTO_LIBRARY "/usr/local/Cellar/openssl@1.1/1.1.1q/lib/libcrypto.dylib") set(OPENSSL_INCLUDE_DIR "/usr/local/Cellar/openssl@1.1/1.1.1q/include")
set(OPENSSL_SSL_LIBRARY "/usr/local/Cellar/openssl@1.1/1.1.1q/lib/libssl.dylib") set(OPENSSL_CRYPTO_LIBRARY "/usr/local/Cellar/openssl@1.1/1.1.1q/lib/libcrypto.dylib")
set(OPENSSL_SSL_LIBRARY "/usr/local/Cellar/openssl@1.1/1.1.1q/lib/libssl.dylib")
endif()

12
src/CMakeLists.txt
View File

@@ -89,8 +89,16 @@ target_link_libraries(
ImGui ImGui
asar-static asar-static
) )
target_compile_definitions(yaze PRIVATE "linux") if (WIN32)
target_compile_definitions(yaze PRIVATE "stricmp=strcasecmp") # target_compile_definitions(yaze PRIVATE "windows")
add_definitions(-DASAR_STATIC)
endif()
if (UNIX)
target_compile_definitions(yaze PRIVATE "linux")
target_compile_definitions(yaze PRIVATE "stricmp=strcasecmp")
endif()
set_target_properties(yaze set_target_properties(yaze
PROPERTIES PROPERTIES