Commit Graph
39 Commits
Author SHA1 Message Date
archshift 99110dc460 Travis: Added OSX, use default compilers, moved cmds into own scripts 2014-06-17 22:57:15 -07:00
archshiftandbunnei ee4717aaae Preprocessor: #if's out OSX-specific GL changes on other platforms 2014-06-12 06:10:55 -04:00
archshiftandbunnei 0a48e97c36 CONTRIBUTING: Fix some examples, escape underscores 2014-06-12 06:10:46 -04:00
archshiftandbunnei d6a4fbf34f Added CONTRIBUTING.md with contents from Coding Style, updated README link 2014-06-12 06:10:45 -04:00
archshift 6655a4751e README: Update wiki links 2014-05-19 20:17:08 -07:00
archshift 5a8ed196e6 common_types: Changed BasicRect back to Rect, in the common namespace
Only Rect is in the namespace for now; the rest of common should be added in the future
2014-05-19 17:57:35 -07:00
archshift 9216c96f48 CMakeLists: Fixed GLEW include var name, compile flag vars
After adding FindGLEW.cmake to externals, the variable call for the GLEW include path needed to be revised.
Append flags on OSX, rather than overwrite them.
I realized that GCC_COMPILE_FLAGS was changed to CMAKE_CXX_FLAGS mistakenly, so both were changed to a more platform-independent name.
2014-05-19 16:42:34 -07:00
archshift 034e3aabc8 Improved clarity and whitespace
Changed QGL version to 3,2 in order to be less restrictive, yet it should still change up to 4,1 on OSX on Qt5.
2014-05-19 15:21:55 -07:00
archshift 403e4bf837 CMakeLists: rename HEADS, improved comments
Changes for clarity of comments, removed redundant compiler flags.
2014-05-19 15:19:36 -07:00
archshift 71b8789803 Indent fixes 2014-05-19 13:51:59 -07:00
archshift 603ef89dad Indent fixes 2014-05-17 12:54:38 -07:00
archshift c396a5ac57 Fixed vfp issues 2014-05-17 10:55:45 -07:00
archshift c1394650ff Updated cmakelists 2014-05-16 23:39:27 -07:00
archshift b8c8d0903e Merge remote-tracking branch 'upstream/master' into issue-7-fix 2014-05-16 23:21:03 -07:00
archshift 1e729e7cae Added FindGLEW to cmake-modules 2014-05-16 23:03:10 -07:00
archshift bd316ca0c0 Fixed indents 2014-05-04 15:47:42 -07:00
archshift 62528320ea Check arg count before attempting to access it. 2014-05-01 20:41:42 -07:00
archshift eec40f8f6f Use runtime arguments to specify boot filename. 2014-05-01 15:13:06 -07:00
archshift 7817d6c79a Support for C++11 on OSX 2014-04-30 23:47:38 -07:00
archshift 704075f04a Fixed indents 2014-04-30 20:13:28 -07:00
archshift 948cfe6d37 Reverse debugging changes 2014-04-30 20:00:44 -07:00
archshift 25106ac96e Revert "Fix Travis"
This reverts commit 7b1d8045ee.
2014-04-30 19:59:38 -07:00
archshift 7b1d8045ee Fix Travis 2014-04-30 19:51:36 -07:00
archshift dade106aa9 Linux support 2014-04-30 18:44:48 -07:00
archshift 04818af42e Merge branch 'issue-7-fix' of https://github.com/archshift/citra into issue-7-fix 2014-04-30 18:37:20 -07:00
archshift 541c9dffb7 Unintended change reversal 2014-04-30 18:36:51 -07:00
archshift fb47258af7 TGA dumps work, courtesy of @bunnei 2014-04-30 18:34:49 -07:00
archshift bdc3c99904 Merge commit upstream/master into issue-7-fix 2014-04-30 18:01:12 -07:00
archshift 3dad4e3b5c Sets OGL version for Qt; will only work with Qt5 2014-04-30 17:10:38 -07:00
archshift c1b770cc0d OpenGL 3+ on OSX with GLFW 2014-04-30 17:00:36 -07:00
archshift a7f3ed003d A bit of Cmake love 2014-04-30 16:56:47 -07:00
archshift 52377cf0d2 Some more experimentation 2014-04-29 19:27:01 -07:00
archshift 237d079aad Merge commit upstream/master into issue-7-fix 2014-04-28 19:44:43 -07:00
archshift 5a9c2ce5ea IT'S ALIVE! 2014-04-28 19:40:39 -07:00
archshift 5749d1eabe Fix complaints about functions that could not be found 2014-04-27 22:25:30 -07:00
archshift 5741f2fb26 Problematic class with no current implementation 2014-04-27 22:24:39 -07:00
archshift b9fc729928 Problematic template functions 2014-04-27 22:23:58 -07:00
archshift 48deb45624 Xcode complains that the class name is redundant. 2014-04-27 22:23:01 -07:00
archshift ff48c8bed3 Rect to BasicRect
Somewhere along the line an OSX header had already taken the name Rect.
2014-04-27 22:21:46 -07:00