Browse Source

Use GL3, fixes macOS setup

master
falkTX 4 years ago
parent
commit
b9033f4490
4 changed files with 6 additions and 8 deletions
  1. +1
    -1
      Makefile
  2. +1
    -1
      dpf
  3. +3
    -3
      plugins/ProM/DistrhoUIProM.cpp
  4. +1
    -3
      plugins/ProM/Makefile

+ 1
- 1
Makefile View File

@@ -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


+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 3c37d4c096dd4decac225c62ca78a0d7526a18ed
Subproject commit 9b838a67d2e07ea72c198e291f7eb654fef541fd

+ 3
- 3
plugins/ProM/DistrhoUIProM.cpp View File

@@ -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
}


+ 1
- 3
plugins/ProM/Makefile View File

@@ -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


Loading…
Cancel
Save