diff --git a/dpf b/dpf index 354bea6..ed12759 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 354bea632df964ff598fd8dc23bcbfa3ae64abac +Subproject commit ed1275997091c51c539c75ae00709912f6a044af diff --git a/plugins/ProM/Makefile b/plugins/ProM/Makefile index 27946d1..60c8263 100644 --- a/plugins/ProM/Makefile +++ b/plugins/ProM/Makefile @@ -119,17 +119,22 @@ LINK_FLAGS += $(shell pkg-config --libs libprojectM) else # HAVE_PROJECTM # compiler macros +BASE_FLAGS += -DHAVE_ALIGNED_ALLOC=1 +BASE_FLAGS += -DHAVE_POSIX_MEMALIGN=1 BASE_FLAGS += -DUSE_TEXT_MENU +BASE_FLAGS += -DUSE_THREADS +# GLES stuff +# BASE_FLAGS += -DUSE_GLES=1 +# Experimental +# BASE_FLAGS += -DHAVE_LLVM=1 ifeq ($(WINDOWS),true) BASE_FLAGS += -DDLLEXPORT= BASE_FLAGS += -DprojectM_FONT_TITLE='"fonts/Vera.tff"' BASE_FLAGS += -DprojectM_FONT_MENU='"fonts/VeraMono.ttf"' BASE_FLAGS += -DSTBI_NO_DDS -# these below do nothing -BASE_FLAGS += -DUSE_FTGL -BASE_FLAGS += -DUSE_NATIVE_GLEW else # WINDOWS BASE_FLAGS += -DDATADIR_PATH='"."' +BASE_FLAGS += -DHAVE_FTS_H endif # WINDOWS # include dirs diff --git a/plugins/ProM/config.h b/plugins/ProM/config.h index b47d83e..018f636 100644 --- a/plugins/ProM/config.h +++ b/plugins/ProM/config.h @@ -13,41 +13,3 @@ * * For a full copy of the license see the LICENSE file. */ - -#pragma once - -#define HAVE_ALIGNED_ALLOC 1 -#define HAVE_FTS_H 1 -#define HAVE_GL 1 -#define HAVE_GL_GL_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_OPENGL_GL_H 1 -#define HAVE_POSIX_MEMALIGN 1 -#define HAVE_PTHREAD_PRIO_INHERIT 1 -#define HAVE_STDINT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_STRING_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_UNISTD_H 1 -#define STDC_HEADERS 1 -#define USE_THREADS 1 - -#define HAVE_DLFCN_H 1 - -#ifdef WIN32 -# define HAVE_WINDOWS_H 1 -#endif - -// GLES stuff -/* -#define HAVE_GLES_GL_H 1 -#define USE_GLES 1 -*/ - -// Experimental -/* -#define HAVE_LLVM 1 -*/