mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-22 23:19:19 +02:00
Merge branch 'milek-dev' into gfx-work
This commit is contained in:
@@ -35,14 +35,7 @@ if (APPLE)
|
||||
endif()
|
||||
|
||||
option(USE_IMGUI_GL3 "Use OpenGL3+ imgui implementation" ON)
|
||||
option(WITH_UART "Compile with libserialport" OFF)
|
||||
|
||||
if (APPLE)
|
||||
set (CMAKE_EXE_LINKER_FLAGS "-pagezero_size 10000 -image_base 100000000")
|
||||
endif()
|
||||
|
||||
option(USE_IMGUI_GL3 "Use OpenGL3+ imgui implementation" OFF)
|
||||
option(WITH_UART "Compile with libserialport" OFF)
|
||||
option(WITH_UART "Compile with libserialport" ON)
|
||||
|
||||
set(SOURCES
|
||||
"Texture.cpp"
|
||||
|
||||
Reference in New Issue
Block a user