jens/Rbm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- put Juce sources in repos

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@641 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2019-11-08 07:13:54 +00:00
parent 28485a4f29
commit cf516a2b16
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+6 -5
View File
@@ -1,7 +1,8 @@
CONFIG ?= release CONFIG ?= release
BUILD_DIR := ./build/${CONFIG} BUILD_DIR := ./build/${CONFIG}
JUCE_ROOT := ../JUCE-3.1.1 JUCE_ROOT := juce/JUCE-3.1.1
JUCE_LIB := juce/build/${CONFIG}/libjuce.a
GPP_SRCS := gui.cpp Rbm.cpp Layer.cpp Stack.cpp MainComponent.cpp RbmComponent.cpp DrawComponent.cpp GPP_SRCS := gui.cpp Rbm.cpp Layer.cpp Stack.cpp MainComponent.cpp RbmComponent.cpp DrawComponent.cpp
GPP_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(GPP_SRCS))) GPP_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(GPP_SRCS)))
GCC_SRCS := noise.c GCC_SRCS := noise.c
@@ -25,7 +26,7 @@ INCLUDES := -I${JUCE_ROOT} -Ijuce
LIBS := -lstdc++ -lm -larmadillo -ljsoncpp -ljuce -lfreetype -lpthread -ldl -lrt -lX11 -lGL -lXinerama -lXext LIBS := -lstdc++ -lm -larmadillo -ljsoncpp -ljuce -lfreetype -lpthread -ldl -lrt -lX11 -lGL -lXinerama -lXext
DEFINES := -DARMA_OPENMP_THREADS=1 DEFINES := -DARMA_OPENMP_THREADS=1
all: ${BUILD_DIR}/rbm.elf all: ${JUCE_LIB} ${BUILD_DIR}/rbm.elf
test: ${BUILD_DIR}/test.elf test: ${BUILD_DIR}/test.elf
${GPP_OBJS}: $(BUILD_DIR)/%.o : source/%.cpp ${GPP_OBJS}: $(BUILD_DIR)/%.o : source/%.cpp
@@ -43,7 +44,7 @@ ${BUILD_DIR}/test.elf: ${TEST_SRCS}
mkdir -p $(dir $@) mkdir -p $(dir $@)
g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} -o $@ ${TEST_SRCS} -larmadillo -ljsoncpp g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} -o $@ ${TEST_SRCS} -larmadillo -ljsoncpp
juce/build/${CONFIG}/libjuce.a: ${JUCE_LIB}:
make -C juce make -C juce
clean: clean:
rm -rf ${BUILD_DIR}/* rm -rf ${BUILD_DIR}
juce/JUCE-3.1.1.zip
BIN
View File
Binary file not shown.
juce/Makefile
+12 -3
View File
@@ -1,6 +1,6 @@
CONFIG ?= release CONFIG ?= release
BUILD_DIR := ./build/${CONFIG} BUILD_DIR := ./build/${CONFIG}
JUCE_ROOT=../../JUCE-3.1.1 JUCE_ROOT=./JUCE-3.1.1
SRCS := modules/juce_core/juce_core.cpp SRCS := modules/juce_core/juce_core.cpp
SRCS += modules/juce_data_structures/juce_data_structures.cpp SRCS += modules/juce_data_structures/juce_data_structures.cpp
SRCS += modules/juce_events/juce_events.cpp SRCS += modules/juce_events/juce_events.cpp
@@ -10,7 +10,8 @@ SRCS += modules/juce_gui_extra/juce_gui_extra.cpp
SRCS += modules/juce_opengl/juce_opengl.cpp SRCS += modules/juce_opengl/juce_opengl.cpp
OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(SRCS))) OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(SRCS)))
all: ${BUILD_DIR}/libjuce.a all: ${JUCE_ROOT} ${BUILD_DIR}/libjuce.a
prepare: ${JUCE_ROOT}
CXXFLAGS += -std=c++11 CXXFLAGS += -std=c++11
CXXFLAGS_debug := ${CXXFLAGS} -O0 -g CXXFLAGS_debug := ${CXXFLAGS} -O0 -g
@@ -25,5 +26,13 @@ ${OBJS}: $(BUILD_DIR)/%.o : ${JUCE_ROOT}/%.cpp
${BUILD_DIR}/libjuce.a: ${OBJS} ${BUILD_DIR}/libjuce.a: ${OBJS}
ar -q $@ ${OBJS} ar -q $@ ${OBJS}
${JUCE_ROOT}:
unzip JUCE-3.1.1.zip
clean: clean:
rm -rf ${BUILD_DIR}/* rm -rf ${BUILD_DIR}/*
distclean:
rm -rf ${BUILD_DIR}
rm -rf ${JUCE_ROOT}