From cf516a2b16a3b8e9ea728406b1b3f255d26e9166 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Fri, 8 Nov 2019 07:13:54 +0000 Subject: [PATCH] - put Juce sources in repos git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@641 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- Makefile | 11 ++++++----- juce/JUCE-3.1.1.zip | Bin 0 -> 7762226 bytes juce/Makefile | 15 ++++++++++++--- 3 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 juce/JUCE-3.1.1.zip diff --git a/Makefile b/Makefile index 9f8f349..dd369a8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ CONFIG ?= release 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_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(GPP_SRCS))) 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 DEFINES := -DARMA_OPENMP_THREADS=1 -all: ${BUILD_DIR}/rbm.elf +all: ${JUCE_LIB} ${BUILD_DIR}/rbm.elf test: ${BUILD_DIR}/test.elf ${GPP_OBJS}: $(BUILD_DIR)/%.o : source/%.cpp @@ -43,7 +44,7 @@ ${BUILD_DIR}/test.elf: ${TEST_SRCS} mkdir -p $(dir $@) g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} -o $@ ${TEST_SRCS} -larmadillo -ljsoncpp -juce/build/${CONFIG}/libjuce.a: +${JUCE_LIB}: make -C juce clean: - rm -rf ${BUILD_DIR}/* \ No newline at end of file + rm -rf ${BUILD_DIR} \ No newline at end of file diff --git a/juce/JUCE-3.1.1.zip b/juce/JUCE-3.1.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..32b7333c06c74ad28bed8b33c816bbfeebce393c GIT binary patch literal 7762226 zcmcG#V~}P+ur1p9+O};@8`HLJ+qOMz+qP%gn6~w`ZGF?-)3)E7ixY9<+#B)ki+KCT zj{1|Cv2$0hs>-!WSq>5k9_&A!pR!33|84L;UI<`tV6qxw5=`vOtjw$|8tMQraAMme zb>;tI0sG%9V*0J5V8Fq^@*u##u>MyIW-A+a8!JaASBw9&4M>?#9QuYDapjXnn8Jak z+9;e@Br7huMbDDziND&`6Mp^ZO|BfK>xTC+<^MR)fNY_ni9=z+?jfTiD20-M$>Ssf zm1k@dXv*ZBBbdXX65m3r$U$|C&UhT#`z;>wxhW+bvXJp-iefS(FG9`|;~)452)TX6 zVYp#yQ`+!(aQADvHx9@93^?t!8iSxeVJ^z*feSx8EQJ9QIxCIxf8P>wq|{URFW+i? zM2JAO0a7H{XJTpA8x=lPUj2tRj(5=TS&`qjx#S$~mMSJxswdPOGHkz!yBL@2tEHIo zMReSj>}r$VT7?D+H?G;&LHF?mX=tTi$66B?v$qDqQ@PqdS$v37Zc?UpS9*mBqX~Qq` zD0Tj?Hv!)5VjLZ8ncq)>Zx|nE*#(K+G``7P-Td4$w{5=6ArBD=)FSp32F^A2_p3ZL zWmR_QR5%kqn)d%Jek)CgZv0)b*?)Yy?~< zpSIJ@k0fJbm~SiJ^ z6>+q2FmbnWaujiPmiX`f{;RwHUa!BwZ(W@s!N9Ds!N5fRFWmiaLNMEUm|3{~=fu3o zvUA$_h8fYPbruwLOEg%XsUWLcE@OQfOv-G~&N5CJ(S_h?{vDI!q7SIpQ7*hmrNOO0 zN{P7%5)gFyOEd6#Y>!T>CXGkFraU#0QX~8qjb#64@uOesAkD+=!SkPI>Anj+#ma3L zC!*R)(p_bOrN6vZHK7Ag_%+ekVRpU6(E!$~>S6Xj#v&{b{-Aoy7><$pBchzs_J;?DUPc4*}NT}0*BbA9G1^kKN8k!yX!AUHiF%O zC8Pw%r9W#>xz0C?5SJq# za14uS$cLf5*2MK+tROG8Vi_*>)VDirWi%6Xj$fP{Gm+bqWE+Ma8}j@n5#MENCW7*h z%qAN5COr&^`@+Y=KxHPl>PlDbY$1sCijpAxo&1e%epag>Gm z32%~kJQWWL`zBQ_CTalsCfFJlltQ?{z{j9<2VY+|!_ac-L}8H-pWxec@&s-tLo`!$be0cu09ZJ>wU2UCNG@ZXD_&*~I z%l}1Pi+b4DoBzK8AFls