mirror of
https://github.com/minetest/minetest.git
synced 2024-11-27 18:13:46 +01:00
Merge pull request #27 from Oblomov/master
* regression fix for windows build.
This commit is contained in:
commit
f5c6e3973c
@ -43,8 +43,6 @@ else()
|
|||||||
find_package(JPEG REQUIRED)
|
find_package(JPEG REQUIRED)
|
||||||
find_package(BZip2 REQUIRED)
|
find_package(BZip2 REQUIRED)
|
||||||
find_package(PNG REQUIRED)
|
find_package(PNG REQUIRED)
|
||||||
find_package(Jthread REQUIRED)
|
|
||||||
find_package(Sqlite3 REQUIRED)
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
FIND_LIBRARY(CARBON_LIB Carbon)
|
FIND_LIBRARY(CARBON_LIB Carbon)
|
||||||
FIND_LIBRARY(COCOA_LIB Cocoa)
|
FIND_LIBRARY(COCOA_LIB Cocoa)
|
||||||
@ -65,6 +63,9 @@ else()
|
|||||||
set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
|
set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
find_package(Jthread REQUIRED)
|
||||||
|
find_package(Sqlite3 REQUIRED)
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
"${PROJECT_SOURCE_DIR}/cmake_config.h.in"
|
"${PROJECT_SOURCE_DIR}/cmake_config.h.in"
|
||||||
"${PROJECT_BINARY_DIR}/cmake_config.h"
|
"${PROJECT_BINARY_DIR}/cmake_config.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user