diff --git a/Makefile b/Makefile index 5167b99..479537d 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ all: dgl plugins gen # -------------------------------------------------------------- dgl: - $(MAKE) -C dpf/dgl + $(MAKE) -C dpf/dgl USE_OPENGL3=true plugins: dgl $(MAKE) all -C plugins/ProM diff --git a/dpf b/dpf index 3c37d4c..9b838a6 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 3c37d4c096dd4decac225c62ca78a0d7526a18ed +Subproject commit 9b838a67d2e07ea72c198e291f7eb654fef541fd diff --git a/plugins/ProM/DistrhoUIProM.cpp b/plugins/ProM/DistrhoUIProM.cpp index 744398e..9b008f9 100644 --- a/plugins/ProM/DistrhoUIProM.cpp +++ b/plugins/ProM/DistrhoUIProM.cpp @@ -97,9 +97,9 @@ void DistrhoUIProM::uiReshape(uint width, uint height) #else projectM::Settings settings; settings.presetURL = "./plugins/ProM/projectM/presets"; - settings.titleFontURL = "./plugins/ProM/projectM/fonts/Vera.ttf"; - settings.menuFontURL = "./plugins/ProM/projectM/fonts/VeraMono.ttf"; - settings.datadir = "./plugins/ProM/projectM/"; + settings.titleFontURL = "fonts/Vera.ttf"; + settings.menuFontURL = "fonts/VeraMono.ttf"; + // settings.datadir = "./plugins/ProM/projectM/"; fPM = new projectM(settings); #endif } diff --git a/plugins/ProM/Makefile b/plugins/ProM/Makefile index d2bfcb0..d308794 100644 --- a/plugins/ProM/Makefile +++ b/plugins/ProM/Makefile @@ -139,8 +139,7 @@ BASE_FLAGS += -DSTDC_HEADERS=1 # BASE_FLAGS += -DUSE_GLES=1 BASE_FLAGS += -DUSE_THREADS=1 # self-contained build -# FIXME -BASE_FLAGS += -DDATADIR_PATH='"./plugins/ProM/projectM/"' +BASE_FLAGS += -DDATADIR_PATH='"."' # silence projectM warnings BASE_FLAGS += -Wno-constant-conversion BASE_FLAGS += -Wno-delete-non-abstract-non-virtual-dtor @@ -152,7 +151,6 @@ BASE_FLAGS += -Wno-unused-variable # maybe maybe # projectm_mac # -fopenmp -# -DPROJECTM_STATIC_DEFINE endif LINK_FLAGS += -lpthread