eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 17:29:18 +02:00
Code Issues 123 Wiki Activity

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2019-04-05 22:32:07 +02:00
parent d364c242aa c90b679f2d
commit b40505715b
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -35,14 +35,7 @@ if (APPLE)
endif() endif()
option(USE_IMGUI_GL3 "Use OpenGL3+ imgui implementation" ON) option(USE_IMGUI_GL3 "Use OpenGL3+ imgui implementation" ON)
option(WITH_UART "Compile with libserialport" OFF) option(WITH_UART "Compile with libserialport" ON)
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)
set(SOURCES set(SOURCES
"Texture.cpp" "Texture.cpp"

2
azure-pipelines.yml
View File

@@ -37,7 +37,7 @@ jobs:
- script: | - script: |
mkdir build mkdir build
cd build cd build
cmake .. -DCMAKE_BUILD_TYPE=Release cmake .. -DCMAKE_BUILD_TYPE=Release -DWITH_UART=OFF
cmake --build . cmake --build .
displayName: 'Build' displayName: 'Build'
- task: PublishBuildArtifacts@1 - task: PublishBuildArtifacts@1