projects
/
vamp-aubio-plugins.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile.inc: move defaults up, set to sdk 2.5
[vamp-aubio-plugins.git]
/
Makefile.inc
diff --git
a/Makefile.inc
b/Makefile.inc
index
438a5b7
..
3015cca
100644
(file)
--- a/
Makefile.inc
+++ b/
Makefile.inc
@@
-12,18
+12,18
@@
#
# $ make -f Makefile.mingw
#
# $ make -f Makefile.mingw
-CFLAGS := $(ARCHFLAGS) $(CFLAGS)
-CXXFLAGS := $(CFLAGS) -I. -I$(VAMPSDK_DIR) $(CXXFLAGS)
-
-LDFLAGS := $(ARCHFLAGS) -L$(VAMPSDK_DIR) -laubio $(LDFLAGS)
-PLUGIN_LDFLAGS := $(LDFLAGS) $(PLUGIN_LDFLAGS)
-
# Defaults, overridden from the platform-specific Makefile
# Defaults, overridden from the platform-specific Makefile
-VAMPSDK_DIR ?= ../vamp-plugin-sdk
+VAMPSDK_DIR ?= ../vamp-plugin-sdk
-2.5
PLUGIN_EXT ?= .so
CXX ?= g++
CC ?= gcc
PLUGIN_EXT ?= .so
CXX ?= g++
CC ?= gcc
+CFLAGS := $(ARCHFLAGS) $(CFLAGS)
+CXXFLAGS := $(CFLAGS) -I. -I$(VAMPSDK_DIR) $(CXXFLAGS)
+
+LDFLAGS := -L$(VAMPSDK_DIR) -laubio $(LDFLAGS)
+PLUGIN_LDFLAGS := $(LDFLAGS) $(PLUGIN_LDFLAGS)
+
# Location of our plugins
#
PLUGINDIR = plugins
# Location of our plugins
#
PLUGINDIR = plugins