Permalink
Browse files

Fixed some problems with the Linux build of the visualization applica…

…tions.
  • Loading branch information...
opendragon committed Sep 6, 2016
1 parent 344b614 commit 1dd91968dbf660436d46017a4ac60b91e9f4d078
@@ -3,6 +3,9 @@
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
JUCELIB := ../../../JuceLibraryCode
COMMONVIS := ../../../CommonVisuals
SRCDIR := ../../Source
ifndef CONFIG
CONFIG=Debug
@@ -18,11 +21,10 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH := -march=native
endif
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=1.4.25" -D "JUCE_APP_VERSION_HEX=0x10419" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I /opt/m+m/include
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=1.4.25" -D "JUCE_APP_VERSION_HEX=0x10419" -I /usr/include -I /usr/include/freetype2 -I $(JUCELIB) -I $(JUCELIB)/modules —I $(COMMONVIS) -I /opt/m+m/include
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0
CXXFLAGS += $(CFLAGS) -std=c++11
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L/opt/m+m/lib -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lYARP_OS -lYARP_init -lm+mCommon -lodLogging -lOGDF -lACE -ldns_sd
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L/opt/m+m/lib -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lYARP_OS -lYARP_init -lm+mCommon -lodLogging -lACE -ldns_sd
TARGET := m+mLeapDisplayOutputService
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
@@ -38,11 +40,10 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH := -march=native
endif
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=1.4.25" -D "JUCE_APP_VERSION_HEX=0x10419" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I /opt/m+m/include
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=1.4.25" -D "JUCE_APP_VERSION_HEX=0x10419" -I /usr/include -I /usr/include/freetype2 -I $(JUCELIB) -I $(JUCEMODS) -I $(COMMONVIS) -I /opt/m+m/include
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3
CXXFLAGS += $(CFLAGS) -std=c++11
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -L/opt/m+m/lib -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lYARP_OS -lYARP_init -lm+mCommon -lodLogging -lOGDF -lACE -ldns_sd
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -L/opt/m+m/lib -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lYARP_OS -lYARP_init -lm+mCommon -lodLogging -lACE -ldns_sd
TARGET := m+mLeapDisplayOutputService
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
@@ -58,6 +59,15 @@ OBJECTS := \
$(OBJDIR)/m+mLeapDisplayOutputService_24261102.o \
$(OBJDIR)/m+mLeapDisplayWindow_c4f886d7.o \
$(OBJDIR)/m+mLeapServiceThread_6460918c.o \
$(OBJDIR)/m+mCaptionedTestField_12345678.o \
$(OBJDIR)/m+mCheckboxField_23456789.o \
$(OBJDIR)/m+mCommonVisuals_34567890.o \
$(OBJDIR)/m+mFormField_45678901.o \
$(OBJDIR)/m+mFormFieldErrorResponder_56789012.o \
$(OBJDIR)/m+mSettingsWindow_67890123.o \
$(OBJDIR)/m+mTextValidator_78901234.o \
$(OBJDIR)/m+mValidatingTextEditor_89012345.o \
$(OBJDIR)/m+mVertexBuffer_90123456.o \
$(OBJDIR)/juce_box2d_ce4232d4.o \
$(OBJDIR)/juce_core_aff681cc.o \
$(OBJDIR)/juce_data_structures_bdd6d488.o \
@@ -84,87 +94,132 @@ strip:
@echo Stripping m+mLeapDisplayOutputService
-@strip --strip-unneeded $(OUTDIR)/$(TARGET)
$(OBJDIR)/m+mLeapDisplayApplication_abb6df13.o: ../../Source/m+mLeapDisplayApplication.cpp
$(OBJDIR)/m+mLeapDisplayApplication_abb6df13.o: $(SRCDIR)/m+mLeapDisplayApplication.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mLeapDisplayApplication.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mLeapDisplayContentPanel_19fbccfb.o: ../../Source/m+mLeapDisplayContentPanel.cpp
$(OBJDIR)/m+mLeapDisplayContentPanel_19fbccfb.o: $(SRCDIR)/m+mLeapDisplayContentPanel.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mLeapDisplayContentPanel.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mLeapDisplayGraphicsFrame_b0a65b8b.o: ../../Source/m+mLeapDisplayGraphicsFrame.cpp
$(OBJDIR)/m+mLeapDisplayGraphicsFrame_b0a65b8b.o: $(SRCDIR)/m+mLeapDisplayGraphicsFrame.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mLeapDisplayGraphicsFrame.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mLeapDisplayGraphicsPanel_76190d3b.o: ../../Source/m+mLeapDisplayGraphicsPanel.cpp
$(OBJDIR)/m+mLeapDisplayGraphicsPanel_76190d3b.o: $(SRCDIR)/m+mLeapDisplayGraphicsPanel.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mLeapDisplayGraphicsPanel.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mLeapDisplayInputHandler_377125ea.o: ../../Source/m+mLeapDisplayInputHandler.cpp
$(OBJDIR)/m+mLeapDisplayInputHandler_377125ea.o: $(SRCDIR)/m+mLeapDisplayInputHandler.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mLeapDisplayInputHandler.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mLeapDisplayMain_f38808a0.o: ../../Source/m+mLeapDisplayMain.cpp
$(OBJDIR)/m+mLeapDisplayMain_f38808a0.o: $(SRCDIR)/m+mLeapDisplayMain.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mLeapDisplayMain.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mLeapDisplayOutputService_24261102.o: ../../Source/m+mLeapDisplayOutputService.cpp
$(OBJDIR)/m+mLeapDisplayOutputService_24261102.o: $(SRCDIR)/m+mLeapDisplayOutputService.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mLeapDisplayOutputService.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mLeapDisplayWindow_c4f886d7.o: ../../Source/m+mLeapDisplayWindow.cpp
$(OBJDIR)/m+mLeapDisplayWindow_c4f886d7.o: $(SRCDIR)/m+mLeapDisplayWindow.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mLeapDisplayWindow.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mLeapServiceThread_6460918c.o: ../../Source/m+mLeapServiceThread.cpp
$(OBJDIR)/m+mLeapServiceThread_6460918c.o: $(SRCDIR)/m+mLeapServiceThread.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mLeapServiceThread.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_box2d_ce4232d4.o: ../../JuceLibraryCode/modules/juce_box2d/juce_box2d.cpp
$(OBJDIR)/m+mCaptionedTestField_12345678.o: $(COMMONVIS)/m+mCaptionedTextField.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mCaptionedTextField.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mCheckboxField_23456789.o: $(COMMONVIS)/m+mCheckboxField.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mCheckboxField.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mCommonVisuals_34567890.o: $(COMMONVIS)/m+mCommonVisuals.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mCommonVisuals.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mFormField_45678901.o: $(COMMONVIS)/m+mFormField.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mFormField.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mFormFieldErrorResponder_56789012.o: $(COMMONVIS)/m+mFormFieldErrorResponder.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mFormFieldErrorResponder.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mSettingsWindow_67890123.o: $(COMMONVIS)/m+mSettingsWindow.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mSettingsWindow.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mTextValidator_78901234.o: $(COMMONVIS)/m+mTextValidator.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mTextValidator.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mValidatingTextEditor_89012345.o: $(COMMONVIS)/m+mValidatingTextEditor.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mValidatingTextEditor.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mVertexBuffer_90123456.o: $(COMMONVIS)/m+mVertexBuffer.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mVertexBuffer.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_box2d_ce4232d4.o: $(JUCELIB)/modules/juce_box2d/juce_box2d.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling juce_box2d.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_core_aff681cc.o: ../../JuceLibraryCode/modules/juce_core/juce_core.cpp
$(OBJDIR)/juce_core_aff681cc.o: $(JUCELIB)/modules/juce_core/juce_core.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling juce_core.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_data_structures_bdd6d488.o: ../../JuceLibraryCode/modules/juce_data_structures/juce_data_structures.cpp
$(OBJDIR)/juce_data_structures_bdd6d488.o: $(JUCELIB)/modules/juce_data_structures/juce_data_structures.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling juce_data_structures.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_events_79b2840.o: ../../JuceLibraryCode/modules/juce_events/juce_events.cpp
$(OBJDIR)/juce_events_79b2840.o: $(JUCELIB)/modules/juce_events/juce_events.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling juce_events.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_graphics_c8f1e7a4.o: ../../JuceLibraryCode/modules/juce_graphics/juce_graphics.cpp
$(OBJDIR)/juce_graphics_c8f1e7a4.o: $(JUCELIB)/modules/juce_graphics/juce_graphics.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling juce_graphics.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_gui_basics_a630dd20.o: ../../JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.cpp
$(OBJDIR)/juce_gui_basics_a630dd20.o: $(JUCELIB)/modules/juce_gui_basics/juce_gui_basics.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling juce_gui_basics.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_gui_extra_7767d6a8.o: ../../JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.cpp
$(OBJDIR)/juce_gui_extra_7767d6a8.o: $(JUCELIB)/modules/juce_gui_extra/juce_gui_extra.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling juce_gui_extra.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_opengl_8899aabb.o: ../../JuceLibraryCode/modules/juce_opengl/juce_opengl.cpp
$(OBJDIR)/juce_opengl_8899aabb.o: $(JUCELIB)/modules/juce_opengl/juce_opengl.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling juce_opengl.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -40,7 +40,7 @@
#include "m+mLeapDisplayGraphicsPanel.hpp"
#include "m+mLeapDisplayApplication.hpp"
#include "m+mLeapDisplayContentPanel.hpp"
#include "m+mVertexBUffer.hpp"
#include "m+mVertexBuffer.hpp"
//#include <odl/ODEnableLogging.h>
#include <odl/ODLogging.h>
Oops, something went wrong.

0 comments on commit 1dd9196

Please sign in to comment.