Skip to content

Commit

Permalink
Update GLFW libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
ottaviohartman committed Aug 28, 2017
1 parent ca8cad5 commit 069cdc7
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ install_manifest.txt
*.la
*.a
*.lib
!/external/lib/*/*
!/external/lib/*/**/*

# Executables
*.exe
Expand Down
12 changes: 10 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/linux" "/usr/lib64")
elseif(WIN32)
set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/win")
if(${MSVC_VERSION} MATCHES "1900")
set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/win/vc2015")
elseif(${MSVC_VERSION} MATCHES "1800")
set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/win/vc2013")
elseif(${MSVC_VERSION} MATCHES "1700")
set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/win/vc2012")
else()
MESSAGE("Error: unsupported MSVC_VERSION: " ${MSVC_VERSION})
endif()
endif()
link_directories(${EXTERNAL_LIB_PATH})
list(APPEND CMAKE_LIBRARY_PATH "${EXTERNAL_LIB_PATH}")
Expand Down Expand Up @@ -57,7 +65,7 @@ endif()

# Crucial magic for CUDA linking
find_package(Threads REQUIRED)
find_package(CUDA REQUIRED)
find_package(CUDA 8.0 REQUIRED)

set(CUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE ON)
set(CUDA_SEPARABLE_COMPILATION ON)
Expand Down
2 changes: 1 addition & 1 deletion INSTRUCTION.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CUDA Introduction - Flocking
============================

This is due Tuesday, September 13.
This is due Sunday, September 10.

**Summary:** In this project, you will get some real experience writing simple
CUDA kernels, using them, and analyzing their performance. You'll implement a
Expand Down
Binary file added external/lib/win/vc2012/glew32s.lib
Binary file not shown.
Binary file added external/lib/win/vc2012/glfw3.lib
Binary file not shown.
Binary file added external/lib/win/vc2012/glfw3dll.lib
Binary file not shown.
Binary file added external/lib/win/vc2013/glew32s.lib
Binary file not shown.
Binary file added external/lib/win/vc2013/glfw3.lib
Binary file not shown.
Binary file added external/lib/win/vc2013/glfw3dll.lib
Binary file not shown.
Binary file added external/lib/win/vc2015/glew32s.lib
Binary file not shown.
Binary file added external/lib/win/vc2015/glfw3.lib
Binary file not shown.
Binary file added external/lib/win/vc2015/glfw3dll.lib
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @file main.cpp
* @brief Example Boids flocking simulation for CIS 565
* @authors Liam Boone, Kai Ninomiya, Kangning (Gary) Li
* @date 2013-2016
* @date 2013-2017
* @copyright University of Pennsylvania
*/

Expand Down

0 comments on commit 069cdc7

Please sign in to comment.