Commit Graph

37 Commits

Author SHA1 Message Date
archshift ee4717aaae Preprocessor: #if's out OSX-specific GL changes on other platforms 2014-06-12 06:10:55 -04:00
bunnei 1de7e8cbe4 Merge branch 'master' of https://github.com/bunnei/citra 2014-05-22 22:54:56 -04:00
bunnei 204c6bfeca Merge pull request #2 from archshift/issue-7-fix
Fixes issues with building Citra on OSX
2014-05-19 21:46:57 -04: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
bunnei 9592d61037 Merge pull request #13 from archshift/master
Use runtime arguments to specify boot filename.
2014-05-18 22:39:40 -04:00
bunnei 265c770a9d updated how we call ARM core to make things much faster 2014-05-17 11:59:18 -04: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 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 dade106aa9 Linux support 2014-04-30 18:44:48 -07:00
archshift fb47258af7 TGA dumps work, courtesy of @bunnei 2014-04-30 18:34:49 -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
Thomas Edvalson a226dc57bf Need to add Xcursor to linker? 2014-04-25 23:01:58 -04:00
Thomas Edvalson c51e4822b1 Fixed CMake's import of GLFW. 2014-04-25 10:50:25 -04:00
bunnei 7a136b8a84 fixes to build on linux 2014-04-22 19:42:29 -07:00
bunnei b0ae99e177 removed unused macros from citra.h 2014-04-10 20:04:38 -04:00
bunnei 9527fc74ad fixed a bunch of errors in CMakeLists 2014-04-09 20:28:43 -07:00
bunnei 6b83509a7e updated CMakeLists 2014-04-09 23:09:05 -04:00
bunnei 5da03e821e - removed deprecated version.h
- cleaned up window title
- cleaned up emu_window_glfw/emu_window
2014-04-08 23:18:23 -04:00
bunnei ad4fffca0d fixed license headers in citra project 2014-04-08 20:25:53 -04:00
bunnei de0a034a84 fixed project includes to use new directory structure 2014-04-08 20:15:08 -04:00
bunnei 63e46abdb8 got rid of 'src' folders in each sub-project 2014-04-08 19:25:03 -04:00
bunnei f446f79da2 Merge branch 'hardware-interface'
Conflicts:
	src/core/src/core.h
2014-04-07 00:57:37 -04:00
bunnei efef514fd8 removed unused comments, changed main processing loop to be infinite 2014-04-07 00:53:47 -04:00
bunnei e4d1ad4bda set window size to correspond to framebuffer sizes 2014-04-06 16:55:05 -04:00
bunnei a604eaee54 added project linker reference 2014-04-06 16:54:28 -04:00
Mathieu Vaillancourt f1fd84aa0f Support vs express edition without having to get platform sdk 2014-04-04 23:10:02 -04:00
bunnei c7f4914a90 added simple processing loop and ELF loading to main()... hackish, will cleanup later 2014-03-31 22:25:55 -04:00
ShizZy e0cb54ea35 moved some core functions over to system module 2013-10-03 17:47:31 -04:00
ShizZy a79fb90d62 upgraded proj files to vs 2013 2013-09-26 22:48:31 -04:00
ShizZy 8bb0c457bc renamed from citrus to citra 2013-09-26 17:34:48 -04:00