summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2020-07-08 13:58:41 -0300
committerThales Lima Oliveira <thaleslima.ufu@gmail.com>2020-07-08 13:58:41 -0300
commitd810272bf506f665096b0b70a96cd20afcbbd90f (patch)
tree56023218baf9b741405c2e51cdc617355a5d9878
parent0450911a3e1c00246bcfa941d18f430b88d0e176 (diff)
downloadPSP.git-d810272bf506f665096b0b70a96cd20afcbbd90f.tar.gz
PSP.git-d810272bf506f665096b0b70a96cd20afcbbd90f.tar.xz
PSP.git-d810272bf506f665096b0b70a96cd20afcbbd90f.zip
CMake GLEW and GLFW include
-rw-r--r--.travis.yml1
-rw-r--r--CMakeLists.txt4
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index fd49775..74ad2c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,7 @@ before_install:
- sudo apt-get install libglew-dev
- sudo apt-get install mesa-utils
- sudo apt-get install libglfw3-dev
+ - sudo apt-get install -y libglew-dev
- sudo apt-get install at-spi2-core
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbb4651..26e12a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package(OpenGL REQUIRED)
find_package(GLUT REQUIRED)
find_package(glfw3 3.1 REQUIRED)
include(${wxWidgets_USE_FILE})
-include_directories( ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS})
+include_directories( ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} ${GLEW_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS})
add_definitions(${OpenGL_DEFINITIONS})
add_definitions(${GLUT_DEFINITIONS})
@@ -54,4 +54,4 @@ file(GLOB PSP_SRC
)
add_executable(${PROJECT_NAME} WIN32 ${PSP_SRC})
-target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} glfw)
+target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${GLEW_LIBRARIES} ${GLFW_LIBRARIES})