yet another win32 build fix. disable openMP on macOS

This commit is contained in:
Flyinghead 2020-12-28 16:56:23 +01:00
parent a1984a026f
commit b8d89da8ab
2 changed files with 2 additions and 2 deletions

View File

@ -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)

View File

@ -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