- added Stack::numLayers()

- added test target

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@615 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
2019-11-07 12:53:11 +00:00
parent 050be15852
commit 94f810abb6
3 changed files with 22 additions and 1 deletions
+8 -1
View File
@@ -6,6 +6,8 @@ GPP_SRCS := Main.cpp Rbm.cpp Layer.cpp Stack.cpp MainComponent.cpp
GPP_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(GPP_SRCS)))
GCC_SRCS := noise.c
GCC_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .c,.o,$(GCC_SRCS)))
TEST_SRCS := source/main.cpp source/Rbm.cpp source/Layer.cpp source/Stack.cpp source/noise.c
CXXFLAGS += -std=c++11 -L juce/build/${CONFIG}
CXXFLAGS_debug := ${CXXFLAGS} -O0 -g
@@ -24,7 +26,8 @@ LIBS := -lstdc++ -lm -larmadillo -ljsoncpp -ljuce -lfreetype -lpthread -ldl -lrt
DEFINES := -DARMA_OPENMP_THREADS=1
all: ${BUILD_DIR}/rbm.elf
test: ${BUILD_DIR}/test.elf
${GPP_OBJS}: $(BUILD_DIR)/%.o : source/%.cpp
mkdir -p $(dir $@)
g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} ${INCLUDES} -o $@ -c $<
@@ -36,6 +39,10 @@ ${GCC_OBJS}: $(BUILD_DIR)/%.o : source/%.c
${BUILD_DIR}/rbm.elf: ${GPP_OBJS} ${GCC_OBJS} juce/build/${CONFIG}/libjuce.a
gcc ${LFLAGS_${CONFIG}} ${GPP_OBJS} ${GCC_OBJS} ${LIBS} -o $@
${BUILD_DIR}/test.elf: ${TEST_SRCS}
mkdir -p $(dir $@)
g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} -o $@ ${TEST_SRCS} -larmadillo -ljsoncpp
juce/build/${CONFIG}/libjuce.a:
make -C juce
clean: