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

- improved makfile

Browse Source 
- link ljuce

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@611 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2019-11-07 09:51:18 +00:00
parent e7c69bb724
commit a52d075a31
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+4 -3
View File
@@ -2,16 +2,17 @@ CONFIG ?= release
SRCS := source/main.cpp source/Rbm.cpp source/Layer.cpp source/Stack.cpp source/noise.c SRCS := source/main.cpp source/Rbm.cpp source/Layer.cpp source/Stack.cpp source/noise.c
LIBS := -larmadillo -ljsoncpp LIBS := -larmadillo -ljsoncpp -lfreetype -lpthread -ldl -lrt -lX11 -lGL -lXinerama -lXext -ljuce
BUILD_DIR := ./build/${CONFIG} BUILD_DIR := ./build/${CONFIG}
all: ${BUILD_DIR}/main.elf all: ${BUILD_DIR}/main.elf
CXXFLAGS += -std=c++11 CXXFLAGS += -std=c++11 -L juce/build/${CONFIG}
CXXFLAGS_debug := ${CXXFLAGS} -O0 -g CXXFLAGS_debug := ${CXXFLAGS} -O0 -g
CXXFLAGS_release := ${CXXFLAGS} -O2 CXXFLAGS_release := ${CXXFLAGS} -O2
DEFINES := -DARMA_OPENMP_THREADS=1 DEFINES := -DARMA_OPENMP_THREADS=1
${BUILD_DIR}/main.elf: ${BUILD_DIR} ${SRCS} ${BUILD_DIR}/main.elf: ${BUILD_DIR} ${SRCS}
g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} ${SRCS} -o $@ ${LIBS} g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} ${SRCS} -o $@ ${LIBS}
juce/Makefile
+2 -3
View File
@@ -10,19 +10,18 @@ SRCS += ${JUCE_ROOT}/juce_gui_extra/juce_gui_extra.cpp
SRCS += ${JUCE_ROOT}/juce_opengl/juce_opengl.cpp SRCS += ${JUCE_ROOT}/juce_opengl/juce_opengl.cpp
OBJS := $(addprefix ${BUILD_DIR}/, $(notdir $(subst .cpp,.o,$(SRCS)))) OBJS := $(addprefix ${BUILD_DIR}/, $(notdir $(subst .cpp,.o,$(SRCS))))
all: ${BUILD_DIR}/juce.a all: ${BUILD_DIR}/libjuce.a
CXXFLAGS += -std=c++11 CXXFLAGS += -std=c++11
CXXFLAGS_debug := ${CXXFLAGS} -O0 -g CXXFLAGS_debug := ${CXXFLAGS} -O0 -g
CXXFLAGS_release := ${CXXFLAGS} -O2 CXXFLAGS_release := ${CXXFLAGS} -O2
INCLUDES := -I./ -I/usr/include/freetype2 INCLUDES := -I./ -I/usr/include/freetype2
LIBS := -lfreetype -lpthread -ldl -lrt -lX11 -lGL -lXinerama -lXext
${OBJS}: ${SRCS} ${BUILD_DIR} ${OBJS}: ${SRCS} ${BUILD_DIR}
g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} ${INCLUDES} -o $@ -c $< g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} ${INCLUDES} -o $@ -c $<
${BUILD_DIR}/juce.a: ${OBJS} ${BUILD_DIR}/libjuce.a: ${OBJS}
ar -q $@ ${OBJS} ar -q $@ ${OBJS}
${BUILD_DIR}: ${BUILD_DIR}: