- changed project

git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@108 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
2014-12-22 17:38:29 +00:00
parent 3c40649d6e
commit de3f6e1441
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -19,7 +19,7 @@ ifeq ($(CONFIG),Debug)
endif
CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -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" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ../../../../libsrc -I ../../../../libsrc/cpp -I ../../Source -I /usr/local/include/eigen3
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 -msse2
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L../../../../libsrc/build/linux -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -lradio -lfir -lcrc
LDDEPS :=
@@ -40,7 +40,7 @@ ifeq ($(CONFIG),Release)
endif
CPPFLAGS := $(DEPFLAGS) -std=c++11 -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" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ../../../../libsrc -I ../../../../libsrc/cpp -I ../../Source -I /usr/local/include/eigen3
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 -msse2
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -L../../../../libsrc/build/linux -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -lradio -lfir -lcrc
LDDEPS :=
+3 -3
View File
@@ -35,12 +35,12 @@
</MAINGROUP>
<EXPORTFORMATS>
<LINUX_MAKE targetFolder="Builds/Linux" externalLibraries="radio&#10;fir&#10;crc&#10;"
extraDefs="" extraCompilerFlags="-std=c++11&#10;-msse2&#10;">
extraDefs="" extraCompilerFlags="-std=c++11&#10;&#10;">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" libraryPath="/usr/X11R6/lib/&#10;../../../../libsrc/build/linux&#10;../../../../libsrc/build/linux&#10;../../../../libsrc/build/linux"
<CONFIGURATION name="Debug" libraryPath="/usr/X11R6/lib/&#10;../../../../libsrc/build/linux&#10;"
isDebug="1" optimisation="1" targetName="M-PSK Receiver" headerPath="../../../../libsrc&#10;../../../../libsrc/cpp&#10;../../Source&#10;/usr/local/include/eigen3"
defines="radio_float_t=float&#10;fir_float_t=float"/>
<CONFIGURATION name="Release" libraryPath="/usr/X11R6/lib/&#10;../../../../libsrc/build/linux&#10;../../../../libsrc/build/linux&#10;../../../../libsrc/build/linux"
<CONFIGURATION name="Release" libraryPath="/usr/X11R6/lib/&#10;../../../../libsrc/build/linux&#10;"
isDebug="0" optimisation="3" targetName="M-PSK Receiver" headerPath="../../../../libsrc&#10;../../../../libsrc/cpp&#10;../../Source&#10;/usr/local/include/eigen3"
defines="radio_float_t=float&#10;fir_float_t=float&#10;NDEBUG&#10;"/>
</CONFIGURATIONS>