Commit Graph

1293 Commits

Author SHA1 Message Date
df2b4978e8 bleh 2018-04-08 14:10:04 -07:00
39dc88bbd6 kind of working itunes plugin support again 2018-04-06 15:17:43 -07:00
0bdecc03e0 Cg support again 2018-04-06 13:58:56 -07:00
f54f29c1eb cleanup 2018-04-05 21:47:23 -07:00
fd6839aef6 readme 2018-04-05 21:36:43 -07:00
74949bf6e7 updating SDL xcode settings 2018-04-05 21:32:08 -07:00
c4c172a6a4 Add FTGL configure flag 2018-04-05 20:41:44 +02:00
f79b682f00 Fix automake cohabitation with qt 2018-04-04 20:21:54 +02:00
283a35346e According to
http://www.astro.gla.ac.uk/~norman/star/dev-nxg-20040116-add-fpp-support/automake.html/Conditional-Subdirectories.html
All directories should be configured (i.e. Makefile generated) even if they aren't being built.
So we need to mark some intermediate sources (those built by Qt's machinery) as
part of sources but not as part of dist.
2018-04-03 03:55:32 -07:00
7fd36f5f97 testing something 2018-04-03 00:11:54 -07:00
42c25b6dbe testing something 2018-04-03 00:06:28 -07:00
65db7ab7d8 merge master 2018-04-02 23:40:13 -07:00
4e873efb5f Remove useless files 2018-04-02 23:37:47 +02:00
a706f73a55 Fix automake files (3/3): pulseaudio automake file created 2018-04-02 23:37:33 +02:00
1dfe9daa48 Fix automake files (2/3): Fix "enable_qt" and "enable_sdl" compile flags conditionals 2018-04-02 23:36:42 +02:00
62b41b5450 ProjectM-qt force Qt ressources to be loaded due to library mode 2018-04-02 23:32:54 +02:00
5ea8d168f6 ProjectM-qt automake fix 2018-04-02 23:30:34 +02:00
707e200676 Native presets (#44)
* native presets building and work. need to figure out how to install them to the right place.

* revert main

* comments

* fix nativepreset installation dir to be presets dir
2018-03-13 02:28:24 +02:00
5ac192c35b build your config w/o fancy sed (#43) 2018-03-13 00:43:12 +02:00
bb55824394 support native presets with .dylib 2018-03-12 14:05:47 -07:00
c2811a15ab merge master 2018-03-12 13:29:23 -07:00
5792fb33d9 Cross-platform GL include (#41)
* qt autoconf

* WIP: Qt5 makefile

* go away cmake

* testing bsd define

* readme

* replacing __linux__ with __unix__

* sdl/libGLU

* Revert "WIP: Qt5 makefile"

This reverts commit aaa44566b9.

* Revert "qt autoconf"

This reverts commit a82dae3c54.

* Revert "go away cmake"

This reverts commit 1392d5e658.

* fix amflags for m4 dir

* opengl header

* opengl header

* use one header for dealing with cross-platform GL includes

* include opengl header in dist

* fix _WIN32 (maybe?)
2018-03-12 22:20:19 +02:00
c768ac2c5f these files don't belong in src control 2018-03-12 13:04:55 -07:00
35976509c0 cmake gone 2018-03-12 13:04:18 -07:00
1392d5e658 go away cmake 2018-03-10 13:32:13 -08:00
aaa44566b9 WIP: Qt5 makefile 2018-03-07 07:23:41 -08:00
4dd4f27cb2 Install presets/fonts/shaders/config (#35)
* install wip

* fix data dir

* test install in travis

* install presets

* fix local install path

* adding header files to SOURCES for dist

* ignore dist pkg

* dist headers, test dist build

* travis test stuff

* include test

* build status

* formatting

* tar fix for long file names from @abramhindle
2018-03-05 14:48:02 +02:00
7b5fcd8032 working on installation of presets/shaders/fonts 2018-03-04 04:43:04 -08:00
4299251371 config file install 2018-03-03 10:46:24 -08:00
83dc1ab6e3 Shared library / header install (#34)
* remove c3d/build

* autotools start

* ignore

* autoreconf? idk

* linux/osx gcc/clang

* no glut, need glew tho

* fix test matrix

* fix linux conditional includes?

* sdl makefile am

* SDL2 m4/autoconf

* idk more m4 crap

* ignore more junk

* ug

* go away idk

* renderer makefile

* fixing SDL's broken-ass sdl2.m4 lol

* progress

* cmake go away

* full autotools build working yay

* autogen script, readme update

* fix linux ifdefs

* stuff

* fix linux -ldl

* mac sdl dep for travis

* whoops

* brewwww

* no osx gcc

* no test

* kinda working linux library build

* travis apt packages

* ignore old SDL2 for travis

* typo

* autogen for osx build readme

* clean up output of configure

* WIP: trying to get header/library to install properly

* merge

* WIP making share lib

* working build of shared/static with libtool

* -no-undefind
2018-03-03 19:56:52 +02:00
154d50caf4 Use autotools to build (#27)
* remove c3d/build

* autotools start

* ignore

* autoreconf? idk

* linux/osx gcc/clang

* no glut, need glew tho

* fix test matrix

* fix linux conditional includes?

* sdl makefile am

* SDL2 m4/autoconf

* idk more m4 crap

* ignore more junk

* ug

* go away idk

* renderer makefile

* fixing SDL's broken-ass sdl2.m4 lol

* progress

* cmake go away

* full autotools build working yay

* autogen script, readme update

* fix linux ifdefs

* stuff

* fix linux -ldl

* mac sdl dep for travis

* whoops

* brewwww

* no osx gcc

* no test

* kinda working linux library build

* travis apt packages

* ignore old SDL2 for travis

* typo

* autogen for osx build readme
2018-02-09 14:25:54 -08:00
57da548526 cmake go away 2018-02-04 11:48:53 -08:00
b0665f00d1 merge master 2018-02-03 04:56:51 -08:00
417370fde8 audio device selection 2018-02-03 01:59:13 -08:00
fc3b15205f merge master 2018-02-02 10:52:45 -08:00
380dea4b53 Merge branch 'master' into build 2018-02-02 10:52:17 -08:00
b9a4515213 shush parser debug 2018-02-02 10:52:08 -08:00
0c52d105a3 We use Qt5 now 2018-01-04 11:53:47 +01:00
cb2a38df56 Replaced libdl library path with the standard CMAKE_DL_LIBS. 2017-11-19 14:32:57 -08:00
3eb68d2170 maximize resolution on fullscreen 2017-10-01 13:00:16 -07:00
0b413429bd renderer xcode project 2017-09-26 07:23:53 -07:00
1c6c029cc9 version check for sdl 2.0.5 2017-09-22 16:08:55 -07:00
c4957fbe4a fixing some linux build stuff 2017-09-22 15:33:50 -07:00
a07db7969b using base dir for path to files 2017-09-22 11:55:07 -07:00
d961eb353e removing cruft, updating readme 2017-09-18 15:29:38 -07:00
7828b8fe07 can build libprojectM+renderer+presetfactories and projectM-SDL with some Make. cmake status: BTFO 2017-09-18 15:18:51 -07:00
67eaf6d6f7 testing Cg framework 2017-09-18 12:06:21 -07:00
b6e7beaea0 refactoring SDL app into a projectM subclass 2017-09-18 11:48:54 -07:00
83ca579792 working audio capture and SDL2 rendering hooray 2017-09-18 00:20:44 -07:00
f96873902b upgrading SDL->projectM keydown handler updated for SDL2 2017-09-17 09:47:39 -07:00