diff options
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index efc871c..07e487d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,11 +1,14 @@ # CBot shared library is built separately add_subdirectory(CBot) +<<<<<<< HEAD # Tools directory is built separately add_subdirectory(tools) # Tests add_subdirectory(graphics/engine/test) +======= +>>>>>>> dev-ui # Configure options @@ -156,10 +159,10 @@ graphics/opengl/gldevice.cpp # ui/check.cpp # ui/color.cpp # ui/compass.cpp -# ui/control.cpp +ui/control.cpp # ui/displayinfo.cpp # ui/displaytext.cpp -# ui/edit.cpp +ui/edit.cpp # ui/editvalue.cpp # ui/gauge.cpp # ui/group.cpp |