move -ladspa/-vst suffixes to directory prefixes

This commit is contained in:
Connor Olding 2015-06-06 20:19:58 -07:00
parent 9aa9fb8e3a
commit bbbfa7690c
7 changed files with 22 additions and 13 deletions

View file

@ -19,11 +19,11 @@ BENCH_AGAINST = eq_const
PROGRAM = ${UTILS:%=$(BIN)/%} PROGRAM = ${UTILS:%=$(BIN)/%}
HEADERS = ${INCLUDES:%=include/%.hpp} HEADERS = ${INCLUDES:%=include/%.hpp}
LADSPA_SHOBJ = ${LADSPA:%=$(BIN)/$(DISTNAME)_%-ladspa.so} LADSPA_SHOBJ = ${LADSPA:%=$(BIN)/ladspa/$(DISTNAME)_%.so}
VST_SHOBJ = ${VST:%=$(BIN)/$(DISTNAME)_%-vst.so} VST_SHOBJ = ${VST:%=$(BIN)/vst/$(DISTNAME)_%.so}
SHOBJ = $(LADSPA_SHOBJ) $(VST_SHOBJ) SHOBJ = $(LADSPA_SHOBJ) $(VST_SHOBJ)
OBJ = ${SHOBJ:.so=.o} OBJ = ${SHOBJ:.so=.o}
AGAINST = $(BIN)/$(DISTNAME)_$(BENCH_AGAINST)-ladspa.so AGAINST = $(BIN)/ladspa/$(DISTNAME)_$(BENCH_AGAINST).so
#EXE = ${PROGRAM:=.exe} #EXE = ${PROGRAM:=.exe}
EXE = $(BIN)/design.exe EXE = $(BIN)/design.exe
DLL = ${SHOBJ:.so=.dll} DLL = ${SHOBJ:.so=.dll}
@ -34,7 +34,7 @@ VST_SRC = ${VST_CPP:%=$(VST_CPP_DIR)/%}
VST_OBJ = ${VST_CPP:%.cpp=$(BIN)/%.o} VST_OBJ = ${VST_CPP:%.cpp=$(BIN)/%.o}
VST_DEF = $(VST_SDK_DIR)/public.sdk/samples/vst2.x/win/vstplug.def VST_DEF = $(VST_SDK_DIR)/public.sdk/samples/vst2.x/win/vstplug.def
GENERAL_FLAGS = -Wall -Winline -Wno-unused-function -Wno-sign-compare -I include GENERAL_FLAGS = -Wall -Winline -Wno-unused-function -Wno-sign-compare -I . -I include
ALL_CXXFLAGS = $(GENERAL_FLAGS) -std=gnu++11 $(CXXFLAGS) ALL_CXXFLAGS = $(GENERAL_FLAGS) -std=gnu++11 $(CXXFLAGS)
ALL_LDFLAGS = -lm $(LDFLAGS) ALL_LDFLAGS = -lm $(LDFLAGS)
@ -98,29 +98,29 @@ $(BIN)/%.dll: $(BIN)/%.so
@echo ' OBJCOPY '$@ @echo ' OBJCOPY '$@
@$(OBJCOPY) -S $< $@ @$(OBJCOPY) -S $< $@
$(BIN)/%-ladspa.so: $(BIN)/%-ladspa.o $(BIN)/ladspa/%.so: $(BIN)/ladspa/%.o
@echo ' CXXLD '$@ @echo ' CXXLD '$@
@$(CXX) $(ALL_CXXFLAGS) $(LADSPA_FLAGS) -shared $^ -o $@ $(ALL_LDFLAGS) @$(CXX) $(ALL_CXXFLAGS) $(LADSPA_FLAGS) -shared $^ -o $@ $(ALL_LDFLAGS)
$(BIN)/%-vst.so: $(BIN)/%-vst.o $(BIN)/vstsdk.o $(BIN)/vst/%.so: $(BIN)/vst/%.o $(BIN)/vstsdk.o
@echo ' CXXLD '$@ @echo ' CXXLD '$@
@$(CXX) $(ALL_CXXFLAGS) $(VST_FLAGS) -shared $^ -o $@ $(ALL_LDFLAGS) @$(CXX) $(ALL_CXXFLAGS) $(VST_FLAGS) -shared $^ -o $@ $(ALL_LDFLAGS)
$(BIN)/$(DISTNAME)_%-ladspa.o: crap/%-ladspa.cpp $(HEADERS) include/ladspa.hpp $(BIN)/ladspa/$(DISTNAME)_%.o: crap/ladspa/%.cpp $(HEADERS) include/ladspa.hpp
@echo ' CXX '$@ @echo ' CXX '$@
@$(CXX) -c $(ALL_CXXFLAGS) $(LADSPA_FLAGS) $(CPPFLAGS) $< -o $@ @$(CXX) -c $(ALL_CXXFLAGS) $(LADSPA_FLAGS) $(CPPFLAGS) $< -o $@
$(BIN)/$(DISTNAME)_%-vst.o: crap/%-vst.cpp $(HEADERS) $(BIN)/vst/$(DISTNAME)_%.o: crap/vst/%.cpp $(HEADERS)
@echo ' CXX '$@ @echo ' CXX '$@
@$(CXX) -c $(ALL_CXXFLAGS) $(VST_FLAGS) $(CPPFLAGS) $< -o $@ @$(CXX) -c $(ALL_CXXFLAGS) $(VST_FLAGS) $(CPPFLAGS) $< -o $@
crap/%-ladspa.cpp: crap/%.hpp template/ladspa.cpp util/generate crap/ladspa/%.cpp: crap/%.hpp template/ladspa.cpp util/generate
@echo ' GEN '$@ @echo ' GEN '$@
@util/generate $(notdir $<) $@ template/ladspa.cpp @util/generate crap/$(notdir $<) $@ template/ladspa.cpp
crap/%-vst.cpp: crap/%.hpp template/vst.cpp util/generate crap/vst/%.cpp: crap/%.hpp template/vst.cpp util/generate
@echo ' GEN '$@ @echo ' GEN '$@
@util/generate $(notdir $<) $@ template/vst.cpp @util/generate crap/$(notdir $<) $@ template/vst.cpp
$(BIN)/vstsdk.o: $(VST_OBJ) $(BIN)/vstsdk.o: $(VST_OBJ)
@echo ' LD '$@ @echo ' LD '$@

View file

@ -40,6 +40,5 @@ other targets:
* LV2 support * LV2 support
* automatically generate markdown table based on crap contents * automatically generate markdown table based on crap contents
* rename plugins (fix capitalization consistency and such) * rename plugins (fix capitalization consistency and such)
* don't suffix -ladspa and -vst on built libraries; it's annoying
* scrap overly-complex makefile for a shell script * scrap overly-complex makefile for a shell script
* support for CPUs without SSE/NEON * support for CPUs without SSE/NEON

2
bin/.gitignore vendored
View file

@ -1,2 +1,4 @@
* *
!.gitignore !.gitignore
!vst
!ladspa

2
bin/ladspa/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*
!.gitignore

2
bin/vst/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*
!.gitignore

2
crap/ladspa/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*
!.gitignore

2
crap/vst/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*
!.gitignore