diff --git a/cmake/asar.cmake b/cmake/asar.cmake index f77c388b..278a264a 100644 --- a/cmake/asar.cmake +++ b/cmake/asar.cmake @@ -24,5 +24,10 @@ set(ASAR_STATIC_SRC "../src/lib/asar/src/asar/warnings.cpp" "../src/lib/asar/src/asar/errors.cpp" "../src/lib/asar/src/asar/platform/file-helpers.cpp" - "../src/lib/asar/src/asar/platform/linux/file-helpers-linux.cpp" -) \ No newline at end of file +) + +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() \ No newline at end of file diff --git a/cmake/openssl.cmake b/cmake/openssl.cmake index 5b03bef5..d2da52c0 100644 --- a/cmake/openssl.cmake +++ b/cmake/openssl.cmake @@ -1,3 +1,5 @@ -set(OPENSSL_INCLUDE_DIR "/usr/local/Cellar/openssl@1.1/1.1.1q/include") -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") +if (UNIX) + set(OPENSSL_INCLUDE_DIR "/usr/local/Cellar/openssl@1.1/1.1.1q/include") + 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() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 14ed4df4..f7de2660 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -89,8 +89,16 @@ target_link_libraries( ImGui asar-static ) -target_compile_definitions(yaze PRIVATE "linux") -target_compile_definitions(yaze PRIVATE "stricmp=strcasecmp") +if (WIN32) + # 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 PROPERTIES