mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-22 18:39:18 +02:00
uart now optional, macos openal fix
This commit is contained in:
@@ -9,6 +9,9 @@ set(CMAKE_CXX_STANDARD 14)
|
||||
include_directories("." "Console" "McZapkie")
|
||||
file(GLOB HEADERS "*.h" "Console/*.h" "McZapkie/*.h")
|
||||
|
||||
option(USE_IMGUI_GL3 "Use OpenGL3+ imgui implementation" OFF)
|
||||
option(WITH_UART "Compile with libserialport" OFF)
|
||||
|
||||
set(SOURCES
|
||||
"Texture.cpp"
|
||||
"Timer.cpp"
|
||||
@@ -66,7 +69,6 @@ set(SOURCES
|
||||
"material.cpp"
|
||||
"lua.cpp"
|
||||
"stdafx.cpp"
|
||||
"uart.cpp"
|
||||
"messaging.cpp"
|
||||
"scene.cpp"
|
||||
"scenenode.cpp"
|
||||
@@ -105,8 +107,6 @@ set(SOURCES
|
||||
"imgui/imgui_impl_glfw.cpp"
|
||||
)
|
||||
|
||||
option(USE_IMGUI_GL3 "Use OpenGL3+ imgui implementation" OFF)
|
||||
|
||||
if (USE_IMGUI_GL3)
|
||||
set(SOURCES ${SOURCES} "imgui/imgui_impl_opengl3.cpp")
|
||||
else()
|
||||
@@ -114,6 +114,10 @@ else()
|
||||
set(SOURCES ${SOURCES} "imgui/imgui_impl_opengl2.cpp")
|
||||
endif()
|
||||
|
||||
if (WITH_UART)
|
||||
set(SOURCES ${SOURCES} "uart.cpp")
|
||||
endif()
|
||||
|
||||
set (PREFIX "")
|
||||
|
||||
if (WIN32)
|
||||
@@ -146,7 +150,7 @@ if (WIN32)
|
||||
set(OPENAL_LIBRARY ${OPENAL_LIBRARY} "${DEPS_DIR}/openal/lib/${ARCH}/OpenAL32.lib")
|
||||
set(LIBSNDFILE_LIBRARY ${LIBSNDFILE_LIBRARY} "${DEPS_DIR}/libsndfile/lib/${ARCH}/libsndfile-1.lib")
|
||||
set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARIES} "${DEPS_DIR}/luajit/lib/${ARCH}/lua51.lib")
|
||||
set(PYTHON_LIBRARY ${PYTHON_LIBRARY} "${DEPS_DIR}/python/lib/${ARCH}/python27.lib")
|
||||
set(PYTHON_LIBRARY ${PYTHON_LIBRARY} "${DEPS_DIR}/python/lib/${ARCH}/python27.lib")
|
||||
set(libserialport_LIBRARY ${LIBSERIALPORT_LIBRARY} "${DEPS_DIR}/libserialport/lib/${ARCH}/libserialport-0.lib")
|
||||
endif()
|
||||
|
||||
@@ -202,9 +206,7 @@ include_directories(${PYTHON_INCLUDE_DIRS})
|
||||
target_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES})
|
||||
|
||||
find_package(PNG REQUIRED)
|
||||
include_directories(${PNG_INCLUDE_DIRS} ${PNG_PNG_INCLUDE_DIR})
|
||||
target_link_libraries(${PROJECT_NAME} ${PNG_LIBRARIES})
|
||||
target_link_libraries(${PROJECT_NAME} ${PNG_LIBRARY})
|
||||
target_link_libraries(${PROJECT_NAME} PNG::PNG)
|
||||
|
||||
find_package(Threads REQUIRED)
|
||||
target_link_libraries(${PROJECT_NAME} Threads::Threads)
|
||||
@@ -224,9 +226,11 @@ find_package(LuaJIT REQUIRED)
|
||||
include_directories(${LUAJIT_INCLUDE_DIR})
|
||||
target_link_libraries(${PROJECT_NAME} ${LUAJIT_LIBRARIES})
|
||||
|
||||
find_package(libserialport REQUIRED)
|
||||
include_directories(${libserialport_INCLUDE_DIR})
|
||||
target_link_libraries(${PROJECT_NAME} ${libserialport_LIBRARY})
|
||||
if (WITH_UART)
|
||||
find_package(libserialport REQUIRED)
|
||||
include_directories(${libserialport_INCLUDE_DIR})
|
||||
target_link_libraries(${PROJECT_NAME} ${libserialport_LIBRARY})
|
||||
endif()
|
||||
|
||||
if (WIN32)
|
||||
target_link_libraries(${PROJECT_NAME} ws2_32)
|
||||
|
||||
Reference in New Issue
Block a user