mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-12 01:22:41 +02:00
more changes to get oven building on Linux
This commit is contained in:
parent
5277a0803c
commit
b1119ff465
2 changed files with 15 additions and 2 deletions
|
@ -4,15 +4,28 @@ setup_hifi_project(Widgets Gui Concurrent)
|
|||
|
||||
link_hifi_libraries(networking shared image gpu ktx)
|
||||
|
||||
setup_memory_debugger()
|
||||
|
||||
if (WIN32)
|
||||
package_libraries_for_deployment()
|
||||
endif ()
|
||||
|
||||
if (UNIX)
|
||||
find_package(Threads REQUIRED)
|
||||
if(THREADS_HAVE_PTHREAD_ARG)
|
||||
target_compile_options(PUBLIC oven "-pthread")
|
||||
endif()
|
||||
endif ()
|
||||
|
||||
# try to find the FBX SDK but fail silently if we don't
|
||||
# because this tool is not built by default
|
||||
find_package(FBX)
|
||||
if (FBX_FOUND)
|
||||
target_link_libraries(${TARGET_NAME} ${FBX_LIBRARIES})
|
||||
if (CMAKE_THREAD_LIBS_INIT)
|
||||
target_link_libraries(${TARGET_NAME} ${FBX_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}")
|
||||
else ()
|
||||
target_link_libraries(${TARGET_NAME} ${FBX_LIBRARIES})
|
||||
endif ()
|
||||
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${FBX_INCLUDE_DIR})
|
||||
endif ()
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "ui/OvenMainWindow.h"
|
||||
#include "Oven.h"
|
||||
#include "BakerCli.h"
|
||||
#include "BakerCLI.h"
|
||||
|
||||
static const QString OUTPUT_FOLDER = "/Users/birarda/code/hifi/lod/test-oven/export";
|
||||
|
||||
|
|
Loading…
Reference in a new issue