fix src/CMakeLists.txt for Windows
This commit is contained in:
parent
29b1299b87
commit
659f1fedc8
@ -20,8 +20,8 @@ endif()
|
|||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
if(VOXELENGINE_BUILD_WINDOWS_VCPKG)
|
if(VOXELENGINE_BUILD_WINDOWS_VCPKG)
|
||||||
set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/lib/lua51.lib")
|
set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/../vcpkg/packages/luajit_x64-windows/lib/lua51.lib")
|
||||||
set(LUA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/include/luajit")
|
set(LUA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../vcpkg/packages/luajit_x64-windows/include/luajit")
|
||||||
find_package(glfw3 REQUIRED)
|
find_package(glfw3 REQUIRED)
|
||||||
find_package(spng REQUIRED)
|
find_package(spng REQUIRED)
|
||||||
find_package(glm REQUIRED)
|
find_package(glm REQUIRED)
|
||||||
@ -34,7 +34,6 @@ if (WIN32)
|
|||||||
set(VORBISLIB vorbis vorbisfile) # not tested
|
set(VORBISLIB vorbis vorbisfile) # not tested
|
||||||
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw)
|
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw)
|
||||||
endif()
|
endif()
|
||||||
message(${LUA_INCLUDE_DIR})
|
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
find_package(PkgConfig)
|
find_package(PkgConfig)
|
||||||
pkg_check_modules(LUAJIT REQUIRED luajit)
|
pkg_check_modules(LUAJIT REQUIRED luajit)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user