From b8d89da8ab5abf9e2174454a977843a912e2fc38 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Mon, 28 Dec 2020 16:56:23 +0100 Subject: [PATCH] yet another win32 build fix. disable openMP on macOS --- CMakeLists.txt | 2 +- shell/linux/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 623993d08..17034e2bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE target_include_directories(${PROJECT_NAME} PRIVATE core core/deps core/deps/stb core/deps/xbyak core/khronos) find_package(OpenMP) -if(OpenMP_CXX_FOUND) +if(OpenMP_CXX_FOUND AND NOT APPLE) target_link_libraries(${PROJECT_NAME} PRIVATE OpenMP::OpenMP_CXX) if(ANDROID_NDK_MAJOR VERSION_GREATER_EQUAL 21) target_link_libraries(${PROJECT_NAME} PRIVATE -static-openmp) diff --git a/shell/linux/Makefile b/shell/linux/Makefile index ee0dd33bf..b74c6b4d3 100644 --- a/shell/linux/Makefile +++ b/shell/linux/Makefile @@ -322,7 +322,7 @@ ifdef USE_MODEM $(RZDCY_SRC_DIR)/deps/miniupnpc/libminiupnpc.a: ifdef FOR_WINDOWS - cd $(RZDCY_SRC_DIR)/deps/miniupnpc; make -f Makefile.mingw libminiupnpc.a + cd $(RZDCY_SRC_DIR)/deps/miniupnpc; mingw32-make -f Makefile.mingw libminiupnpc.a else cd $(RZDCY_SRC_DIR)/deps/miniupnpc; make libminiupnpc.a endif