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

- fixed overwriting define and include of packages

Browse Source 
- added blase path

git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@938 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2022-06-02 18:37:19 +00:00
parent 9f601d2fe6
commit 51ab8c01eb
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Fir/Makefile
+2 -2
View File
@@ -4,7 +4,7 @@ NAME := Fir
GCC_SRCS := $(LIBSRC_PATH)/fir/fir2.c GCC_SRCS := $(LIBSRC_PATH)/fir/fir2.c
INCLUDES ?= -I $(LIBSRC_PATH) INCLUDES += -I $(LIBSRC_PATH)
DEFINES ?= -Dradio_float_t=float -Dfir_float_t=float DEFINES += -Dradio_float_t=float -Dfir_float_t=float
include $(MAKE_HOME)/compile.mk include $(MAKE_HOME)/compile.mk
JuceLibraryCode/Makefile
+4 -5
View File
@@ -20,10 +20,9 @@ SOURCES += juce_opengl/juce_opengl.cpp
SOURCES += juce_video/juce_video.cpp SOURCES += juce_video/juce_video.cpp
CXX_SRCS := $(addprefix $(JUCE_MODULES)/, $(SOURCES)) CXX_SRCS := $(addprefix $(JUCE_MODULES)/, $(SOURCES))
INCLUDES ?= -I . -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I /usr/include/freetype2 INCLUDES += -I . -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I /usr/include/freetype2
DEFINES += -DJUCE_GCC=1 -DLINUX=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000
DEFINES := -DJUCE_GCC=1 -DLINUX=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 DEFINES_debug += -DDEBUG=1 -D_DEBUG=1
DEFINES_debug ?= -DDEBUG=1 -D_DEBUG=1 DEFINES_release += -DNDEBUG
DEFINES_release ?= -DNDEBUG
include $(MAKE_HOME)/compile.mk include $(MAKE_HOME)/compile.mk
Makefile
+2
View File
@@ -5,10 +5,12 @@ CXXFLAGS_release := -O3 -flto
CFLAGS_release := -O3 -flto CFLAGS_release := -O3 -flto
LDFLAGS_release := -O3 -flto LDFLAGS_release := -O3 -flto
TARGET_ARCH := -march=native TARGET_ARCH := -march=native
CXXFLAGS += -std=c++17
LIBS := -lstdc++ -lm -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt LIBS := -lstdc++ -lm -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt
LDFLAGS += $(TARGET_ARCH) $(LIBDIR) -L/usr/X11R6/lib/ LDFLAGS += $(TARGET_ARCH) $(LIBDIR) -L/usr/X11R6/lib/
DEFINES += -DPROCESSOR_BUFFER_USE_EXCEPTIONS -DDISABLE_UNUSED_STATISTICS DEFINES += -DPROCESSOR_BUFFER_USE_EXCEPTIONS -DDISABLE_UNUSED_STATISTICS
INCLUDES += -I $(BLAZE_PATH)
all: app all: app
app: objects link app: objects link
Radio/Makefile
+2 -2
View File
@@ -22,7 +22,7 @@ GCC_SRCS += $(LIBSRC_PATH)/radio/statistics.c
GCC_SRCS += $(LIBSRC_PATH)/radio/symbol.c GCC_SRCS += $(LIBSRC_PATH)/radio/symbol.c
GCC_SRCS += $(LIBSRC_PATH)/radio/synchronization.c GCC_SRCS += $(LIBSRC_PATH)/radio/synchronization.c
INCLUDES ?= -I $(LIBSRC_PATH) -I $(EIGEN_PATH) INCLUDES += -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
DEFINES ?= -Dradio_float_t=float -Dfir_float_t=float DEFINES += -Dradio_float_t=float -Dfir_float_t=float
include $(MAKE_HOME)/compile.mk include $(MAKE_HOME)/compile.mk
Source/Makefile
+1 -1
View File
@@ -12,6 +12,6 @@ CXX_SRCS += IQPlaneComponent.cpp
CXX_SRCS += MainComponent.cpp CXX_SRCS += MainComponent.cpp
CXX_SRCS += Main.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 include $(MAKE_HOME)/compile.mk
config.mk
+1
View File
@@ -7,5 +7,6 @@ MAKEFLAGS += --no-print-directory
LIBSRC_PATH ?= $(realpath ../../libsrc) LIBSRC_PATH ?= $(realpath ../../libsrc)
JUCE_PATH ?= $(realpath ../../extlib/JUCE) JUCE_PATH ?= $(realpath ../../extlib/JUCE)
EIGEN_PATH ?= $(realpath ../../extlib/eigen) EIGEN_PATH ?= $(realpath ../../extlib/eigen)
BLAZE_PATH ?= $(realpath ../../extlib/blaze)
export export