Zach
|
7e907a2736
|
Update README.md
added backticks to make instruction
|
2015-04-12 21:58:24 -07:00 |
|
zmertens
|
c65f173cc2
|
Merge remote-tracking branch 'upstream/master'
merge
|
2015-04-12 21:54:30 -07:00 |
|
zmertens
|
70d3538927
|
Merge branch 'master' of https://github.com/zwookie/LearnOpenGL
merge
|
2015-04-12 21:53:19 -07:00 |
|
zmertens
|
049037561a
|
added keyboard call back to geometry shader tutorial
|
2015-04-12 21:01:31 -07:00 |
|
JoeyDeVries
|
4eff9ea1b1
|
Merge pull request #6 from zwookie/master
Improvements to Linux CMake building
|
2015-04-08 23:39:00 +02:00 |
|
Zach
|
9602f4d618
|
Update README.md
added backticks to make instruction
|
2015-04-08 14:23:23 -07:00 |
|
zmertens
|
2193cb3fc4
|
fixed issue with Linux and CMake not finding resource files when launching executable and edited README for Linux more precise building instructions
|
2015-04-08 14:20:44 -07:00 |
|
Joey de Vries
|
c9e0b5bdb8
|
Added '3' to glfw library
Changed readme to link to glfw3-dev instead of glfw-dev. Linking to glfw
without the '3' links to glfw version 2.
|
2015-04-07 18:18:21 +02:00 |
|
Joey de Vries
|
33dba66ea1
|
Edited/removed comments, changes readme
Edited/removed comments, changes readme
|
2015-04-04 13:33:31 +02:00 |
|
JoeyDeVries
|
949afc1e9c
|
Merge pull request #4 from zwookie/master
Adjustment to how binaries are built from CMake, small README change
|
2015-04-04 13:23:51 +02:00 |
|
zwookie
|
27f3a2b9bc
|
fixed CMake lib / includes path finding during configuration
|
2015-04-04 02:55:33 -07:00 |
|
zmertens
|
ea910a55ca
|
changed Win32 and Unix method for copying shaders and executables
|
2015-04-02 13:48:28 -07:00 |
|
zmertens
|
3d71a928ce
|
modified README
|
2015-04-01 19:52:15 -07:00 |
|
zmertens
|
5c97e68cf4
|
modified Find*.cmake files to look in the LearnOpenGL local includes and lib directories
|
2015-04-01 19:48:25 -07:00 |
|
zmertens
|
80d126cfa2
|
added bin directory to build process to allow resources to load from exectuable
|
2015-04-01 19:37:41 -07:00 |
|
JoeyDeVries
|
e7f2622fde
|
Merge pull request #3 from zwookie/cmake_features
Cmake features
|
2015-04-01 08:44:58 +02:00 |
|
zmertens
|
38f1272107
|
moved Apple lib append to Apple if / else statement
|
2015-03-31 19:13:01 -07:00 |
|
zmertens
|
2098e992b2
|
CMake builds GLFW correctly and some changes to the layout
|
2015-03-31 19:01:31 -07:00 |
|
zmertens
|
0b093c5365
|
added Find*.cmake files and cmake/modules directory
|
2015-03-31 18:11:48 -07:00 |
|
Joey de Vries
|
7efd3c1e40
|
Solve merge conflict
Conflicts:
CMakeLists.txt
|
2015-03-31 17:02:36 +02:00 |
|
Joey de Vries
|
3321b60f79
|
CMakeList updated + Readme
Merged changes from Inner_Product s.t. makelist still works as it did
before, now with proper Linux libraries.
|
2015-03-31 17:00:57 +02:00 |
|
JoeyDeVries
|
5fa7656460
|
Merge pull request #2 from zwookie/single_cmake_linux
modified CMakeLists and fixed includes
|
2015-03-31 09:07:54 +02:00 |
|
zmertens
|
4a96cd428c
|
modified CMakeLists and fixed includes
|
2015-03-31 00:02:08 -07:00 |
|
Joey de Vries
|
18cc43ad85
|
added flag
Added C++11 flag to CMakeLists thanks to Inner_Product
|
2015-03-30 18:00:47 +02:00 |
|
Joey de Vries
|
2131cb0616
|
Testing readme direct urls
|
2015-03-23 15:47:04 +01:00 |
|
Joey de Vries
|
f28ad1e256
|
Initial commit, all code samples with working CMake script for VS/Windows.
|
2015-03-23 15:42:04 +01:00 |
|