Skip to content

Commit

Permalink
Revert last commit (except for update to the README).
Browse files Browse the repository at this point in the history
  • Loading branch information
paulthomson committed Aug 5, 2017
1 parent c4161b5 commit ee7067c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ find_package(glfw3 REQUIRED)
add_executable(get_image get_image.cpp lodepng.cpp glad.c)
add_executable(get_gl_info get_gl_info.cpp glad.c)

target_link_libraries(get_image glfw dl)
target_link_libraries(get_gl_info glfw dl)
target_link_libraries(get_image glfw)
target_link_libraries(get_gl_info glfw)

target_include_directories(get_image PUBLIC include)
target_include_directories(get_gl_info PUBLIC include)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ Useful flags:
* `--persist` - causes the shader to be rendered until the window is closed
* `--output <OUTPUT_FILE>` - a png file will be produced at the given location with the contents of the rendered shader (default is `output.png`)
* `--vertex <PATH_TO_VERTEX_SHADER>` - provide a custom vertex shader file rather than using the default (provided in `get_image.cpp`).

7 changes: 3 additions & 4 deletions build/build-linux
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ set -u
cd ..
mkdir -p out/linux/temp
cd out/linux/temp
#cmake -G "Unix Makefiles" ../../.. -DCMAKE_BUILD_TYPE=Release
#cmake --build . --config Release
cmake -G "Unix Makefiles" ../../.. -DCMAKE_BUILD_TYPE=Debug
cmake --build . --config Debug
cmake -G "Unix Makefiles" ../../.. -DCMAKE_BUILD_TYPE=Release
cmake --build . --config Release
cmake -DCMAKE_INSTALL_PREFIX=../install -P cmake_install.cmake

0 comments on commit ee7067c

Please sign in to comment.