From 926e1e49d54a8523381bfa8e4457ada1a1eff2a5 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Thu, 21 Nov 2019 21:36:20 +0000 Subject: [PATCH] - more abstract git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@694 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- juce/Makefile | 1 + juce/pkg.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/juce/Makefile b/juce/Makefile index 3b56611..bbb0f48 100644 --- a/juce/Makefile +++ b/juce/Makefile @@ -1,6 +1,7 @@ CONFIG ?= release PKG_VER := JUCE-3.1.1 TARGET := LINUX +BUILD_TARGET := libjuce.a SRCS := modules/juce_core/juce_core.cpp SRCS += modules/juce_data_structures/juce_data_structures.cpp diff --git a/juce/pkg.mk b/juce/pkg.mk index 3f311cd..c7fe9ed 100644 --- a/juce/pkg.mk +++ b/juce/pkg.mk @@ -3,7 +3,7 @@ PKG_ROOT := ./${PKG_VER} OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(SRCS))) .PHONY: ${PKG_VER}.patch -all: ${PKG_ROOT} ${BUILD_DIR}/libjuce.a +all: ${PKG_ROOT} ${BUILD_DIR}/${BUILD_TARGET} prepare: ${PKG_ROOT} patch: ${PKG_VER}.patch @@ -25,7 +25,7 @@ ${OBJS}: $(BUILD_DIR)/%.o : ${PKG_ROOT}/%.cpp mkdir -p $(dir $@) g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} ${INCLUDES} -o $@ -c $< -${BUILD_DIR}/libjuce.a: ${OBJS} +${BUILD_DIR}/${BUILD_TARGET}: ${OBJS} ar -q $@ ${OBJS} ${PKG_ROOT}: