8ca2d5ccfb
merge
2016-07-31 20:22:27 -07:00
226e4df6b4
restoring normal option functionality
2016-07-31 20:21:42 -07:00
9b3d0f93c9
Merge branch 'master' into gles
2016-07-31 20:00:08 -07:00
42885b0543
building native presets working on linux basically w00t
2016-07-31 19:59:56 -07:00
3c81d470c7
merge
2016-07-31 19:45:32 -07:00
67a2802c75
set() combined with option() doesn't seem to work all that great
2016-07-31 19:44:56 -07:00
3ceba0134a
fix message thing
2016-07-31 19:42:01 -07:00
3d3beb3e8b
fix message thing
2016-07-31 19:41:38 -07:00
056af5c866
Merge branch 'gles' of github.com:revmischa/projectM into gles
2016-07-31 16:12:19 -07:00
afed3e81be
gles gl.h support
2016-07-31 16:11:59 -07:00
0a59697783
gles gl.h support
2016-07-31 16:11:48 -07:00
cfaaa73eda
typo, message if building static or dynamic
2016-07-31 16:11:36 -07:00
188d1f2b2f
need SDLmain for test project linking
2016-07-31 16:07:32 -07:00
3bd66dcb3f
fix fixmes for portal includes for libsdl
2016-07-31 16:05:13 -07:00
91f777ec56
enabling projectm-test, trying to get it to build
2016-07-31 15:59:33 -07:00
1112d8e397
script to look for issues in porting to gles
2016-07-31 15:21:21 -07:00
4974739cd0
merge in master
2016-07-30 16:41:05 -07:00
bec76d2cec
default ftgl on
2016-07-30 16:15:19 -07:00
b8b4d569a0
linux build instructions
2016-07-30 16:13:04 -07:00
d1b8601478
needed for CMAKE_DEPENDENT_OPTION
2016-07-30 16:00:14 -07:00
b3c77afa93
disable FBO by default if using GLES
2016-07-30 16:00:14 -07:00
c013c4aecb
USE_NATIVE_GLEW was really misleadingly named. have options take on OS-specific defaults for libprojectm
2016-07-30 16:00:14 -07:00
96bef6524c
clearer var name for presets samples
2016-07-30 16:00:14 -07:00
c171d3c9e5
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
d22ca81185
findSDL thing for cmake
2016-07-30 16:00:14 -07:00
7cfbfd4412
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
8b502516b1
updated build config
...
updated build instructions for os x :: added FindSDL2 cmake module
2016-07-30 16:00:14 -07:00
c72f76e451
ignore presets
2016-07-30 16:00:14 -07:00
feee170e55
blah
2016-07-30 16:00:14 -07:00
8001aa12a5
at least the SDL app runs now
2016-07-30 16:00:14 -07:00
9e14442714
SDL2 cmake stuff
2016-07-30 16:00:14 -07:00
2e11700fe1
SDL project for OSX
2016-07-30 16:00:14 -07:00
060288483a
need to deal with coreaudio
2016-07-30 16:00:14 -07:00
2b25ee901f
search /usr/local/include
2016-07-30 16:00:14 -07:00
54073ba4b1
start of SDL standalone version
2016-07-30 16:00:14 -07:00
1fc6908e04
compiling on arm? relocation is gonna fail unless position-independent
2016-07-30 16:00:14 -07:00
bed83721e0
remove debugging
2016-07-30 16:00:14 -07:00
6e6027984d
OSX #define fixes, start of standalone SDL version
2016-07-30 16:00:14 -07:00
831838b474
was about to do audio input via libsdl2.. turns out it isn't implemented\! lol\!
2016-07-30 16:00:14 -07:00
0073c9c009
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
72dce2d738
compile on OSX with glew in /usr/include/GL
2016-07-30 16:00:14 -07:00
cad0f2d851
merge master build changs
2016-07-30 15:22:20 -07:00
697012473e
needed for CMAKE_DEPENDENT_OPTION
2016-07-30 14:40:37 -07:00
cf8bc7f416
disable FBO by default if using GLES
2016-07-30 14:35:35 -07:00
5b2ab02264
USE_NATIVE_GLEW was really misleadingly named. have options take on OS-specific defaults for libprojectm
2016-07-30 14:32:07 -07:00
06f2d9bade
clearer var name for presets samples
2016-07-30 14:23:16 -07:00
685eb918f9
have option defaults based on OS, i have no idea if this is how one does this correctly in cmake
2016-07-30 14:19:10 -07:00
01bba93510
findSDL thing for cmake
2016-07-30 14:18:55 -07:00
668f9935aa
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-05-17 07:23:52 -04:00
79a6cba130
updated build config
...
updated build instructions for os x :: added FindSDL2 cmake module
2016-05-17 07:22:17 -04:00
