Commit Graph

28 Commits

Author SHA1 Message Date
a9be845e2d Fixed several build/install errors for out-of-source config's. (#518)
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2021-08-17 22:01:39 +03:00
636149482c Mac enable glText (#472)
* Enable text for SDL app on mac

* fix screenshots

* brew readme

* wip
2021-02-28 19:09:31 +02:00
23027108b5 Code signing for macOS (#471)
* rewrite PCM interface
use public methods, hide internal implementation
use ifft for smoothing

* AutoLeveler

* remove slow std::transform()

* faster smooth algorithm

* perf - quick check for no equations

* adjustments for wavecode.bspectrum=1

* cleanup use of BeatDetect.beatSensitivity

* comments

* more comments

* enum CHANNEL

* fix windows build

* fix windows build

* wip

* macOS installer signing works finally

* version bump

Co-authored-by: Matthew Bellew <matthewb@labkey.com>
2021-02-23 22:11:57 +02:00
f7f74b11e3 Xcode cleanup, single mac installer, universal binary support (#461)
* Mac installer now contains both the app and Music plugin
* Major xcode projects cleanup
* Working universal binary build with xcode and installer (needs universal sdl2 to link against)
* Fix #460 - texture2D is renamed texture (#462)
2021-02-14 13:41:02 +02:00
5ff6b4a09f Wavemode7 (#457)
* test all wavemodes
* fix wavemode=7 DoubleLine

* don't install test presets

* and don't create test directory

Co-authored-by: Matthew Bellew <matthewb@labkey.com>
2021-02-13 17:07:48 -08:00
3b43901679 A bit of cleanup, disable touch events (via #define) 2021-02-12 22:38:49 +02:00
f8d1684461 xcode update for glm headers 2020-07-28 22:16:50 +03:00
e49720ecfa Preset subdirs (#385)
Scanning textures/presets dirs for textures and scanning preset dir for presets.
Scanning is now done recursively, so presets and textures can be organized into subdirectories instead of needing to be flattened into a single directory.

On POSIX systems makes use of [ftw](https://linux.die.net/man/3/ftw) which should be relatively efficient. Otherwise falls back to recursing with `dirent` (for windows).

Probably should have made an autoconf check for `ftw` instead of doing `#ifdef WIN32`. 

* Scan subdirectories in presets directory

* remove preset subdir config

* Recursively scan for textures too, add c++-17 compatibility

* Refactor directory scanning code so it's reused by texture loader and preset loader. Make cross-platform (maybe)

* filescanner in makefile

* extension filter for file loader

* make extensions match up'

* need string.h

* Add FileScanner.cpp to win build (maybe)

* scan all dirs

* #ifndef #ifdef is def fun

* bogus comment

* bleh

* bleh

* itunes plugin with c++17

* EyeTunes needs to know about the FileScanner

Co-authored-by: milkdropper.com <milkdropper.com@gmail.com>
Co-authored-by: milkdropper <59471060+milkdropper@users.noreply.github.com>
2020-07-28 22:01:56 +03:00
e51b2c7d63 Don't require user to provide libglm (#387)
* Don't require user to provide libglm

* dist vendor

* Remove GLM requirement, add vendor headers.

Co-authored-by: milkdropper.com <milkdropper.com@gmail.com>
2020-07-27 22:56:40 +03:00
7751996b15 try to avoid linking sdl2 framework 2020-06-08 15:57:34 +03:00
890f0ace02 bumping version, update autoconf qt 2020-05-24 21:33:49 +03:00
0758b042be add preset name to window title, add mac build debug Make target with xcodebuild 2020-01-27 22:12:22 +02:00
36cd7ea64a fix OSX install by use of preset subdirs
Before was a `install -D ...` used but `-D` not supported on OSX.

With this change becomes it removed and on a separate call before all
required directories created.
2019-12-15 09:21:21 +02:00
75db5c231e allow separate folder structure of presets during install (#249)
This is intended to install the folders as deposited at the source. If the backend is used then the desired folder will be selected.

This allows a better overlay of the available presets and avoids overwriting the same filenames in different folders during installation.

New configure value "--enable-preset-subdirs"
2019-10-06 22:26:38 +03:00
1ffc0cdb5a Sort input file list (#176)
so that projectM builds in a reproducible way
in spite of indeterministic filesystem readdir order.

See https://reproducible-builds.org/ for why this is good.

Without this patch, multiple .milk files varied between builds
in interesting ways:
--- "old//usr/share/projectM/presets/Geiss - All-Spark Polar.milk"
+++ "new//usr/share/projectM/presets/Geiss - All-Spark Polar.milk"
@@ -3,7 +3,7 @@
 PSVERSION_WARP=2^M
 PSVERSION_COMP=2^M
 [preset00]^M
-fRating=4.000000^M
+fRating=2.0^M
2019-03-11 16:02:41 +02:00
ee0407a4cd mac-dist 2019-03-04 21:36:23 +02:00
e2f84f0a51 fix up macos build script 2019-03-03 12:51:25 +02:00
482a6f041f automating dist for macOS 2019-03-03 12:40:09 +02:00
23d60d21a4 Makefile: qt / jack / pulseaudio (#163)
Major updates to Makefiles, please report any build time issues!
Adding/updating makefiles for Qt, Jack, and Pulseadio implementations



* detect if we have libpulseaudio, libsdl2, and qt5 and if so just enable them automatically without the user having to.

* jack support, travis build with pa/jack/qt

* pass config opts

* test

* test

* test

* don't always enable sdl

* better libsdl2 detection

* hopefully fixed qt/pulse/jack makefiles

* oops

* travis

* fix jack subdir

* jack fixup

* jack makefile

* libsdl 1 for jack

* jack builds yay (qt version)

* testqt

* readme

* let's always build test

* let's always build test

* sdl2 for travis build test

* qt is required for jack/pulse
2019-02-28 15:17:35 +02:00
e2dc9f91a3 removing cg shaders from makefile 2018-06-14 11:12:57 +03:00
7d414b93a9 Makefile.am: Fix installation with DESTDIR set
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-06-04 22:35:38 +02:00
c1ee4bd6dd libprojectM xcode project 2018-04-08 08:17:38 -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
a8bb9846bf build your config w/o fancy sed (#43) 2018-03-13 00:43:12 +02: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
c06e3b6b80 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
9f4d359713 working on installation of presets/shaders/fonts 2018-03-04 04:43:04 -08:00
8eaa232dda 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