Commit Graph

1478 Commits

Author SHA1 Message Date
f175751da0 cleanup 2018-04-05 21:47:23 -07:00
e4735008ff ignores 2018-04-05 21:37:57 -07:00
b7d3efa759 mega super old doc stuff 2018-04-05 21:37:08 -07:00
8962102c20 readme 2018-04-05 21:36:43 -07:00
043c88f0e5 updating SDL xcode settings 2018-04-05 21:32:08 -07:00
a52282463c bump version 2018-04-05 21:14:33 -07:00
21c7eb26bb readme update 2018-04-05 21:13:07 -07:00
8323aa563b Merge pull request #48 from deltaoscarmike/ftgl
Add FTGL configure flag
2018-04-05 21:46:22 +02:00
66a0c4dc3d Fix OSX build 2018-04-05 21:31:21 +02:00
5ebf5183ad Add FTGL configure flag 2018-04-05 20:41:44 +02:00
5f96e6a10a Merge pull request #42 from projectM-visualizer/qt
Qt5+pulseaudio support from @deltaoscarmike
2018-04-04 21:37:08 +02:00
5265a35ae8 Merge pull request #47 from deltaoscarmike/qt
Fix automake cohabitation with qt
2018-04-04 21:23:59 +02:00
5639865bc4 Fix automake cohabitation with qt 2018-04-04 20:21:54 +02:00
5df5c904bd typos 2018-04-04 04:12:44 -07:00
804b87a655 test fixing 2018-04-03 12:28:14 -07:00
25a4ab8bf4 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
f37eba253e nicer configure output 2018-04-03 00:19:33 -07:00
ee5b8fd755 testing something 2018-04-03 00:11:54 -07:00
623329b409 testing something 2018-04-03 00:06:28 -07:00
82d66e45c5 fixing merge 2018-04-03 00:00:38 -07:00
6b66aa8ced merge master 2018-04-02 23:40:13 -07:00
2ee558a86d Merge branch 'qt' of github.com:projectM-visualizer/projectm into qt 2018-04-02 22:57:07 -07:00
74aaf94e5a Merge pull request #46 from deltaoscarmike/qt
Qt fixes
2018-04-03 08:50:26 +03:00
4f1de698e8 Remove useless files 2018-04-02 23:37:47 +02:00
c2bc83e3f3 Fix automake files (3/3): pulseaudio automake file created 2018-04-02 23:37:33 +02:00
89f7d25df4 Fix automake files (2/3): Fix "enable_qt" and "enable_sdl" compile flags conditionals 2018-04-02 23:36:42 +02:00
1b8c35b81b Fix automake files (1/3): Qt and pulseaudio are interdependent thus "enable_qt" compile flag builds both 2018-04-02 23:35:56 +02:00
72c5c809d9 ProjectM-qt force Qt ressources to be loaded due to library mode 2018-04-02 23:32:54 +02:00
7d6e913716 ProjectM-qt automake fix 2018-04-02 23:30:34 +02:00
24d79f69d5 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
a8bb9846bf build your config w/o fancy sed (#43) 2018-03-13 00:43:12 +02:00
e0a94c4b76 test building sdl 2018-03-12 14:20:31 -07:00
9f77741b28 only add sdl makefile if building sdl 2018-03-12 14:20:04 -07:00
b9d2ff1fee support native presets with .dylib 2018-03-12 14:05:47 -07:00
00ce11acee merge master 2018-03-12 13:40:00 -07:00
cca43dab5c make building SDL app optional, off by default. just build libprojectM by default 2018-03-12 13:38:47 -07:00
18203bd842 merge master 2018-03-12 13:29:23 -07:00
015abbd116 removing options that don't do anything 2018-03-12 13:27:31 -07:00
2df0738cce 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
d0f22ad772 maintainer notes 2018-03-12 13:16:08 -07:00
760fc94eb2 TODO is now in README 2018-03-12 13:06:18 -07:00
076e5c5b3f deleting old build instructions to cause less confusion for maintainers 2018-03-12 13:06:02 -07:00
601721eafa these files don't belong in src control 2018-03-12 13:04:55 -07:00
54cb43e25f cmake gone 2018-03-12 13:04:18 -07:00
8e97c9c91c this is old 2018-03-12 13:03:28 -07:00
c5744382d7 go away cmake 2018-03-10 13:32:13 -08:00
506d7bc400 WIP: Qt5 makefile 2018-03-07 07:23:41 -08:00
dc48e1dc2a qt autoconf 2018-03-07 06:48:08 -08:00
cde9e840ae README tidy 2018-03-07 06:08:57 -08:00
0636332107 bump version forwards 2018-03-07 06:00:50 -08:00