| @@ -65,3 +65,6 @@ JackBridge%.w64.o: JackBridge%.cpp | |||||
| $(WINECXX) $^ $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@ $(CMD_STRIP) $@ | $(WINECXX) $^ $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@ $(CMD_STRIP) $@ | ||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| clean: | |||||
| rm -f *.o ../jackbridge-*.* | |||||
| @@ -15,6 +15,7 @@ LILV_VERSION = 0.16.0 | |||||
| BUILD_C_FLAGS += -w | BUILD_C_FLAGS += -w | ||||
| BUILD_C_FLAGS += -Iconfig -I../../includes | BUILD_C_FLAGS += -Iconfig -I../../includes | ||||
| BUILD_C_FLAGS += -Iserd-$(SERD_VERSION) -Isord-$(SORD_VERSION) -Isratom-$(SRATOM_VERSION) | |||||
| OBJS = serd.c.o sord.c.o sratom.c.o lilv.c.o | OBJS = serd.c.o sord.c.o sratom.c.o lilv.c.o | ||||
| OBJS_posix32 = serd.c.posix32.o sord.c.posix32.o sratom.c.posix32.o lilv.c.posix32.o | OBJS_posix32 = serd.c.posix32.o sord.c.posix32.o sratom.c.posix32.o lilv.c.posix32.o | ||||
| @@ -4,12 +4,12 @@ | |||||
| # Created by falkTX | # Created by falkTX | ||||
| # | # | ||||
| include ../Makefile.mk | |||||
| include ../../Makefile.mk | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| BUILD_CXX_FLAGS += -I. -I../includes -I../utils | |||||
| QT5_CXX_FLAGS = $(BUILD_CXX_FLAGS) | |||||
| BUILD_CXX_FLAGS += -I. -I../../includes -I../utils | |||||
| QT5_CXX_FLAGS = $(BUILD_CXX_FLAGS) # FIXME: use copy instead of reference | |||||
| ifeq ($(HAVE_QT4),true) | ifeq ($(HAVE_QT4),true) | ||||
| BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui) | BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui) | ||||
| @@ -76,10 +76,11 @@ OBJS_win64 = \ | |||||
| all: ../theme.a | all: ../theme.a | ||||
| posix32: ../rtmempool.posix32.a | |||||
| posix64: ../rtmempool.posix64.a | |||||
| win32: ../rtmempool.win32.a | |||||
| win64: ../rtmempool.win64.a | |||||
| qt5: ../theme.qt5.a | |||||
| posix32: ../theme.posix32.a | |||||
| posix64: ../theme.posix64.a | |||||
| win32: ../theme.win32.a | |||||
| win64: ../theme.win64.a | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| @@ -136,7 +137,7 @@ win64: ../rtmempool.win64.a | |||||
| moc_%.cpp: %.hpp | moc_%.cpp: %.hpp | ||||
| $(MOC) $< -o $@ | $(MOC) $< -o $@ | ||||
| resources.cpp: ../../resources/resources-theme.qrc | |||||
| resources.cpp: ../../../resources/resources-theme.qrc | |||||
| $(RCC) $< -o $@ | $(RCC) $< -o $@ | ||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| @@ -0,0 +1,16 @@ | |||||
| #!/usr/bin/make -f | |||||
| # Makefile for utils # | |||||
| # ------------------ # | |||||
| # Created by falkTX | |||||
| # | |||||
| include ../../Makefile.mk | |||||
| # -------------------------------------------------------------- | |||||
| all: | |||||
| clean: | |||||
| debug: | |||||
| $(MAKE) DEBUG=true | |||||
| @@ -4,11 +4,11 @@ | |||||
| # Created by falkTX | # Created by falkTX | ||||
| # | # | ||||
| include ../Makefile.mk | |||||
| include ../../Makefile.mk | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| BUILD_CXX_FLAGS += -I. -I../includes -I../utils | |||||
| BUILD_CXX_FLAGS += -I. -I../../includes -I../utils | |||||
| ifeq ($(HAVE_QT4),true) | ifeq ($(HAVE_QT4),true) | ||||
| BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui) | BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui) | ||||
| @@ -33,21 +33,13 @@ OBJS = \ | |||||
| moc_paramspinbox.cpp.o \ | moc_paramspinbox.cpp.o \ | ||||
| moc_pixmapkeyboard.cpp.o | moc_pixmapkeyboard.cpp.o | ||||
| TARGET = ../libs/widgets.a | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| all: $(TARGET) | |||||
| clean: | |||||
| rm -f $(FILES) $(TARGET) $(OBJS) | |||||
| debug: | |||||
| $(MAKE) DEBUG=true | |||||
| all: ../widgets.a | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| $(TARGET): $(FILES) $(OBJS) | |||||
| ../widgets.a: $(FILES) $(OBJS) | |||||
| $(AR) rs $@ $(OBJS) | $(AR) rs $@ $(OBJS) | ||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| @@ -60,3 +52,11 @@ moc_%.cpp.o: %.cpp | |||||
| moc_%.cpp: %.hpp | moc_%.cpp: %.hpp | ||||
| $(MOC) $< -o $@ | $(MOC) $< -o $@ | ||||
| # -------------------------------------------------------------- | |||||
| clean: | |||||
| rm -f *.o ../widgets.* $(FILES) | |||||
| debug: | |||||
| $(MAKE) DEBUG=true | |||||