Commit Graph

2431 Commits

Author SHA1 Message Date
7849d724b2 merge 2016-07-31 19:45:32 -07:00
7773bfc668 set() combined with option() doesn't seem to work all that great 2016-07-31 19:44:56 -07:00
3e84250ac2 fix message thing 2016-07-31 19:42:01 -07:00
5392673820 fix message thing 2016-07-31 19:41:38 -07:00
a3211cf6c2 Merge branch 'gles' of github.com:revmischa/projectM into gles 2016-07-31 16:12:19 -07:00
fe7d18fd62 gles gl.h support 2016-07-31 16:11:59 -07:00
e5c86108a6 gles gl.h support 2016-07-31 16:11:48 -07:00
f740d6735d typo, message if building static or dynamic 2016-07-31 16:11:36 -07:00
5e7259de88 need SDLmain for test project linking 2016-07-31 16:08:02 -07:00
00a6da689f fix fixmes for portal includes for libsdl 2016-07-31 16:08:02 -07:00
dd780e096e enabling projectm-test, trying to get it to build 2016-07-31 16:08:02 -07:00
719f5eacc5 need SDLmain for test project linking 2016-07-31 16:07:32 -07:00
bad45464b5 fix fixmes for portal includes for libsdl 2016-07-31 16:05:13 -07:00
33deba1ea0 enabling projectm-test, trying to get it to build 2016-07-31 15:59:33 -07:00
e03d8ef698 merge repo versions 2016-07-31 15:24:43 -07:00
dfd48c0e73 script to look for issues in porting to gles 2016-07-31 15:21:21 -07:00
80abed7264 merge sdl 2016-07-30 16:53:43 -07:00
fb85e388ce ugh 2016-07-30 16:52:31 -07:00
d3bd6c3c2b merge in master 2016-07-30 16:41:05 -07:00
a2f54cc59b default ftgl on 2016-07-30 16:15:19 -07:00
987a1d3f0b linux build instructions 2016-07-30 16:13:04 -07:00
0bdd42ca5a some presets have too long names 2016-07-30 16:00:14 -07:00
750b8da2e8 sourceforge wiki appears to be gone lol 2016-07-30 16:00:14 -07:00
3c21caaf8d formatting 2016-07-30 16:00:14 -07:00
1b77516505 readme 2016-07-30 16:00:14 -07:00
4e51a45e94 needed for CMAKE_DEPENDENT_OPTION 2016-07-30 16:00:14 -07:00
0b44269809 disable FBO by default if using GLES 2016-07-30 16:00:14 -07:00
53f8c621bc USE_NATIVE_GLEW was really misleadingly named. have options take on OS-specific defaults for libprojectm 2016-07-30 16:00:14 -07:00
cecd90717c clearer var name for presets samples 2016-07-30 16:00:14 -07:00
3ea411794d have option defaults based on OS, i have no idea if this is how one does this correctly in cmake 2016-07-30 16:00:14 -07:00
7dedc8879d first time configuration 2016-07-30 16:00:14 -07:00
40c0c4516f markdown readme 2016-07-30 16:00:14 -07:00
ba4fc33c3a findSDL thing for cmake 2016-07-30 16:00:14 -07:00
e74bf22ccb fixes
fixed a bug causing a crash with PerlinNoise/ShaderEngine.cpp :: calling projectM::projectM_resetGL() applies the new dimensions to the window width/height in the settings :: modified the parser to return an error rather than abort and terminate the process to prevent a crash with the provided sample presets
2016-07-30 16:00:14 -07:00
0a46307662 updated build config
updated build instructions for os x :: added FindSDL2 cmake module
2016-07-30 16:00:14 -07:00
2a1f690fd8 ignore presets 2016-07-30 16:00:14 -07:00
daf5257534 blah 2016-07-30 16:00:14 -07:00
3e74fc8ba1 at least the SDL app runs now 2016-07-30 16:00:14 -07:00
aaaa8f1718 SDL2 cmake stuff 2016-07-30 16:00:14 -07:00
7eb519fcad SDL project for OSX 2016-07-30 16:00:14 -07:00
3be257fd36 need to deal with coreaudio 2016-07-30 16:00:14 -07:00
a4aa8ea7fd search /usr/local/include 2016-07-30 16:00:14 -07:00
ee05b91107 start of SDL standalone version 2016-07-30 16:00:14 -07:00
fbc578d775 compiling on arm? relocation is gonna fail unless position-independent 2016-07-30 16:00:14 -07:00
f408517502 remove debugging 2016-07-30 16:00:14 -07:00
c69051eb7d OSX #define fixes, start of standalone SDL version 2016-07-30 16:00:14 -07:00
81c522ce93 was about to do audio input via libsdl2.. turns out it isn't implemented\! lol\! 2016-07-30 16:00:14 -07:00
c47f426085 got it compiling on OSX again, looking into enumeration of audio input capture sources, dropping 'for itunes' from name 2016-07-30 16:00:14 -07:00
6195911949 compile on OSX with glew in /usr/include/GL 2016-07-30 16:00:14 -07:00
96574a9c18 Merge branch 'master' into sdl 2016-07-30 15:50:40 -07:00