- cleaned up Makefiles
git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@930 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
+2
-2
@@ -4,7 +4,7 @@ NAME := Fir
|
||||
|
||||
GCC_SRCS := $(LIBSRC_PATH)/fir/fir2.c
|
||||
|
||||
INCLUDES += -I $(LIBSRC_PATH)
|
||||
DEFINES := -Dradio_float_t=float -Dfir_float_t=float
|
||||
INCLUDES ?= -I $(LIBSRC_PATH)
|
||||
DEFINES ?= -Dradio_float_t=float -Dfir_float_t=float
|
||||
|
||||
include $(MAKE_HOME)/compile.mk
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
MAKE_HOME ?= /home/jens/work/software/make
|
||||
CONFIG ?= debug
|
||||
BUILD_DIR ?= ./build/${CONFIG}
|
||||
MAKEFLAGS += --no-print-directory
|
||||
|
||||
LIBSRC_PATH ?= $(realpath ../../../libsrc)
|
||||
|
||||
@@ -2,6 +2,8 @@ include ./config.mk
|
||||
|
||||
NAME := Juce
|
||||
|
||||
JUCE_MODULES := ${JUCE_PATH}/modules
|
||||
|
||||
SOURCES := juce_audio_basics/juce_audio_basics.cpp
|
||||
SOURCES += juce_audio_devices/juce_audio_devices.cpp
|
||||
SOURCES += juce_audio_formats/juce_audio_formats.cpp
|
||||
@@ -17,10 +19,10 @@ SOURCES += juce_gui_extra/juce_gui_extra.cpp
|
||||
SOURCES += juce_opengl/juce_opengl.cpp
|
||||
SOURCES += juce_video/juce_video.cpp
|
||||
|
||||
CXX_SRCS += $(addprefix $(JUCE_MODULES)/, $(SOURCES))
|
||||
INCLUDES += -I . -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I /usr/include/freetype2
|
||||
CXX_SRCS := $(addprefix $(JUCE_MODULES)/, $(SOURCES))
|
||||
INCLUDES ?= -I . -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I /usr/include/freetype2
|
||||
|
||||
DEFINES_debug := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "radio_float_t=float" -D "fir_float_t=float"
|
||||
DEFINES_release := -D "LINUX=1" -D "NDEBUG" -D "radio_float_t=float" -D "fir_float_t=float" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000"
|
||||
DEFINES_debug ?= -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "radio_float_t=float" -D "fir_float_t=float"
|
||||
DEFINES_release ?= -D "LINUX=1" -D "NDEBUG" -D "radio_float_t=float" -D "fir_float_t=float" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000"
|
||||
|
||||
include $(MAKE_HOME)/compile.mk
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
MAKE_HOME ?= /home/jens/work/software/make
|
||||
CONFIG ?= debug
|
||||
BUILD_DIR ?= ./build/${CONFIG}
|
||||
MAKEFLAGS += --no-print-directory
|
||||
|
||||
JUCE_PATH ?= $(realpath ../../../extlib/JUCE)
|
||||
JUCE_MODULES := ${JUCE_PATH}/modules
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
include ./config.mk
|
||||
export
|
||||
|
||||
DEFINES := -Dradio_float_t=float -Dfir_float_t=float
|
||||
CXXFLAGS_release := -O3 -flto
|
||||
CFLAGS_release := -O3 -flto
|
||||
LDFLAGS_release := -O3 -flto
|
||||
@@ -12,11 +12,25 @@ DEFINES += -DPROCESSOR_BUFFER_USE_EXCEPTIONS
|
||||
|
||||
all: app
|
||||
app: objects link
|
||||
objects:
|
||||
@$(MAKE) -C JuceLibraryCode
|
||||
@$(MAKE) -C Source
|
||||
@$(MAKE) -C Radio
|
||||
@$(MAKE) -C Crc
|
||||
@$(MAKE) -C Fir
|
||||
|
||||
.PHONY: JuceLibraryCode Radio Source Crc Fir
|
||||
|
||||
objects: JuceLibraryCode Radio Source Crc Fir
|
||||
|
||||
JuceLibraryCode:
|
||||
@$(MAKE) -C $@
|
||||
|
||||
Radio:
|
||||
@$(MAKE) -C $@
|
||||
|
||||
Source:
|
||||
@$(MAKE) -C $@
|
||||
|
||||
Crc:
|
||||
@$(MAKE) -C $@
|
||||
|
||||
Fir:
|
||||
@$(MAKE) -C $@
|
||||
|
||||
|
||||
include $(MAKE_HOME)/link.mk
|
||||
|
||||
+6
-2
@@ -6,6 +6,10 @@ CXX_SRCS := $(LIBSRC_PATH)/cpp/radio/Formatter.cpp
|
||||
CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Symbolizer.cpp
|
||||
CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Scrambler.cpp
|
||||
CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Frame.cpp
|
||||
CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/Farrow.cpp
|
||||
CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/PolyPhase.cpp
|
||||
CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/UpSampler.cpp
|
||||
CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/DownSampler.cpp
|
||||
|
||||
GCC_SRCS := $(LIBSRC_PATH)/radio/real.c
|
||||
GCC_SRCS += $(LIBSRC_PATH)/radio/cpx.c
|
||||
@@ -18,7 +22,7 @@ GCC_SRCS += $(LIBSRC_PATH)/radio/statistics.c
|
||||
GCC_SRCS += $(LIBSRC_PATH)/radio/symbol.c
|
||||
GCC_SRCS += $(LIBSRC_PATH)/radio/synchronization.c
|
||||
|
||||
INCLUDES += -I $(LIBSRC_PATH)
|
||||
DEFINES := -Dradio_float_t=float -Dfir_float_t=float
|
||||
INCLUDES ?= -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
|
||||
DEFINES ?= -Dradio_float_t=float -Dfir_float_t=float
|
||||
|
||||
include $(MAKE_HOME)/compile.mk
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
MAKE_HOME ?= /home/jens/work/software/make
|
||||
CONFIG ?= debug
|
||||
BUILD_DIR ?= ./build/${CONFIG}
|
||||
MAKEFLAGS += --no-print-directory
|
||||
|
||||
LIBSRC_PATH ?= $(realpath ../../../libsrc)
|
||||
EIGEN_PATH ?= $(realpath ../../../extlib/eigen)
|
||||
|
||||
+1
-1
@@ -12,6 +12,6 @@ CXX_SRCS += IQPlaneComponent.cpp
|
||||
CXX_SRCS += MainComponent.cpp
|
||||
CXX_SRCS += Main.cpp
|
||||
|
||||
INCLUDES += -I . -I $(realpath ../JuceLibraryCode) -I $(JUCE_PATH) -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
|
||||
INCLUDES ?= -I . -I $(realpath ../JuceLibraryCode) -I $(JUCE_PATH) -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
|
||||
|
||||
include $(MAKE_HOME)/compile.mk
|
||||
|
||||
Reference in New Issue
Block a user