diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-07 14:22:45 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-07 14:22:45 -0500 |
| commit | da454bb943929ae649c09ca948e7c83644c35712 (patch) | |
| tree | 1358ea11b33b17b41c8073df9ddb6228a617f831 /CMakeLists.txt | |
| parent | 97d7fb425da906947cc45e11fadb35f708da50d6 (diff) | |
| parent | 1e8de01d3704c584e43e1b84947487c2aaddb7d7 (diff) | |
| download | therapy-da454bb943929ae649c09ca948e7c83644c35712.tar.gz therapy-da454bb943929ae649c09ca948e7c83644c35712.tar.bz2 therapy-da454bb943929ae649c09ca948e7c83644c35712.zip | |
Merge branch 'master' into es-rewrite
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
| diff --git a/CMakeLists.txt b/CMakeLists.txt index 553d757..12d2551 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -43,9 +43,15 @@ set(ALL_LIBS | |||
| 43 | include_directories( | 43 | include_directories( |
| 44 | ${LIBXML2_INCLUDE_DIR} | 44 | ${LIBXML2_INCLUDE_DIR} |
| 45 | ${GLFW_INCLUDE_DIRS} | 45 | ${GLFW_INCLUDE_DIRS} |
| 46 | ${OPENGL_INCLUDE_DIRS} | ||
| 47 | ${GLEW_INCLUDE_DIRS} | ||
| 46 | src | 48 | src |
| 47 | ) | 49 | ) |
| 48 | 50 | ||
| 51 | link_directories( | ||
| 52 | ${GLFW_LIBRARY_DIRS} | ||
| 53 | ) | ||
| 54 | |||
| 49 | # include_directories(${SDL2_INCLUDE_DIR}) | 55 | # include_directories(${SDL2_INCLUDE_DIR}) |
| 50 | set(CMAKE_BUILD_TYPE Debug) | 56 | set(CMAKE_BUILD_TYPE Debug) |
| 51 | add_executable(Aromatherapy | 57 | add_executable(Aromatherapy |