Permalink
Browse files

Fixed path issues for Linux builds.

  • Loading branch information...
Norman Jaffe Norman Jaffe
Norman Jaffe authored and Norman Jaffe committed Sep 7, 2016
1 parent 1dd9196 commit 45af2a1d1ff56de4cf7cf3b0294e3ff253d48725
@@ -21,17 +21,17 @@ 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 $(JUCELIB) -I $(JUCELIB)/modules I $(COMMONVIS) -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 -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 -lGL
TARGET := m+mLeapDisplayOutputService
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
endif
ifeq ($(CONFIG),Release)
BINDIR := build
INDIR := build
LIBDIR := build
OBJDIR := build/intermediate/Release
OUTDIR := build
@@ -40,10 +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 $(JUCELIB) -I $(JUCEMODS) -I $(COMMONVIS) -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 $(JUCELIB)/modules -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 -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 -lGL
TARGET := m+mLeapDisplayOutputService
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
@@ -75,7 +75,7 @@ OBJECTS := \
$(OBJDIR)/juce_graphics_c8f1e7a4.o \
$(OBJDIR)/juce_gui_basics_a630dd20.o \
$(OBJDIR)/juce_gui_extra_7767d6a8.o \
$(OBJDIR)/juce_opengl_8899aabb.o \
$(OBJDIR)/juce_opengl_8899aabb.o
.PHONY: clean
@@ -140,49 +140,49 @@ $(OBJDIR)/m+mLeapServiceThread_6460918c.o: $(SRCDIR)/m+mLeapServiceThread.cpp
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/m+mCaptionedTestField_12345678.o: $(COMMONVIS)/m+mCaptionedTextField.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling m+mCaptionedTextField.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-@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 "$<"
-@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 "$<"
-@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 "$<"
-@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 "$<"
-@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 "$<"
-@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 "$<"
-@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 "$<"
-@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 "$<"
-@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)
@@ -21,10 +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 $(JUCELIB) -I $(JUCELIB)/modules I $(COMMONVIS) -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 -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 -lGL
TARGET := m+mPlatonicDisplayOutputService
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
@@ -43,7 +43,7 @@ ifeq ($(CONFIG),Release)
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 $(JUCELIB)/modules -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 -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 -lGL
TARGET := m+mPlatonicDisplayOutputService
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
@@ -75,7 +75,7 @@ OBJECTS := \
$(OBJDIR)/juce_graphics_c8f1e7a4.o \
$(OBJDIR)/juce_gui_basics_a630dd20.o \
$(OBJDIR)/juce_gui_extra_7767d6a8.o \
$(OBJDIR)/juce_opengl_8899aabb.o \
$(OBJDIR)/juce_opengl_8899aabb.o
.PHONY: clean

0 comments on commit 45af2a1

Please sign in to comment.