Browse Source

Introjucer: Fixed an ordering problem in linux makefile generation.

tags/2021-05-28
jules 12 years ago
parent
commit
68227e8b29
7 changed files with 22 additions and 22 deletions
  1. +3
    -3
      extras/Introjucer/Builds/Linux/Makefile
  2. +4
    -4
      extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h
  3. +3
    -3
      extras/JuceDemo/Builds/Linux/Makefile
  4. +3
    -3
      extras/audio plugin demo/Builds/Linux/Makefile
  5. +3
    -3
      extras/audio plugin host/Builds/Linux/Makefile
  6. +3
    -3
      extras/binarybuilder/Builds/Linux/Makefile
  7. +3
    -3
      extras/example projects/Builds/Linux/Makefile

+ 3
- 3
extras/Introjucer/Builds/Linux/Makefile View File

@@ -1,6 +1,9 @@
# Automatically generated makefile, created by the Introjucer # Automatically generated makefile, created by the Introjucer
# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project! # Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
ifndef CONFIG ifndef CONFIG
CONFIG=Debug CONFIG=Debug
endif endif
@@ -45,9 +48,6 @@ ifeq ($(CONFIG),Release)
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
endif endif
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
OBJECTS := \ OBJECTS := \
$(OBJDIR)/jucer_AppearanceSettings_788d9889.o \ $(OBJDIR)/jucer_AppearanceSettings_788d9889.o \
$(OBJDIR)/jucer_CommandLine_f35de107.o \ $(OBJDIR)/jucer_CommandLine_f35de107.o \


+ 4
- 4
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h View File

@@ -264,6 +264,10 @@ private:
<< "# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!" << newLine << "# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!" << newLine
<< newLine; << newLine;
out << "# (this disables dependency generation if multiple architectures are set)" << newLine
<< "DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)" << newLine
<< newLine;
out << "ifndef CONFIG" << newLine out << "ifndef CONFIG" << newLine
<< " CONFIG=" << escapeSpaces (getConfiguration(0)->getName()) << newLine << " CONFIG=" << escapeSpaces (getConfiguration(0)->getName()) << newLine
<< "endif" << newLine << "endif" << newLine
@@ -272,10 +276,6 @@ private:
for (ConstConfigIterator config (*this); config.next();) for (ConstConfigIterator config (*this); config.next();)
writeConfig (out, *config); writeConfig (out, *config);
out << "# (this disables dependency generation if multiple architectures are set)" << newLine
<< "DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)" << newLine
<< newLine;
writeObjects (out, files); writeObjects (out, files);
out << ".PHONY: clean" << newLine out << ".PHONY: clean" << newLine


+ 3
- 3
extras/JuceDemo/Builds/Linux/Makefile View File

@@ -1,6 +1,9 @@
# Automatically generated makefile, created by the Introjucer # Automatically generated makefile, created by the Introjucer
# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project! # Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
ifndef CONFIG ifndef CONFIG
CONFIG=Debug CONFIG=Debug
endif endif
@@ -45,9 +48,6 @@ ifeq ($(CONFIG),Release)
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
endif endif
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
OBJECTS := \ OBJECTS := \
$(OBJDIR)/ApplicationStartup_3bf86e16.o \ $(OBJDIR)/ApplicationStartup_3bf86e16.o \
$(OBJDIR)/MainDemoWindow_f9e963d5.o \ $(OBJDIR)/MainDemoWindow_f9e963d5.o \


+ 3
- 3
extras/audio plugin demo/Builds/Linux/Makefile View File

@@ -1,6 +1,9 @@
# Automatically generated makefile, created by the Introjucer # Automatically generated makefile, created by the Introjucer
# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project! # Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
ifndef CONFIG ifndef CONFIG
CONFIG=Debug CONFIG=Debug
endif endif
@@ -45,9 +48,6 @@ ifeq ($(CONFIG),Release)
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
endif endif
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
OBJECTS := \ OBJECTS := \
$(OBJDIR)/PluginProcessor_a059e380.o \ $(OBJDIR)/PluginProcessor_a059e380.o \
$(OBJDIR)/PluginEditor_94d4fb09.o \ $(OBJDIR)/PluginEditor_94d4fb09.o \


+ 3
- 3
extras/audio plugin host/Builds/Linux/Makefile View File

@@ -1,6 +1,9 @@
# Automatically generated makefile, created by the Introjucer # Automatically generated makefile, created by the Introjucer
# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project! # Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
ifndef CONFIG ifndef CONFIG
CONFIG=Debug CONFIG=Debug
endif endif
@@ -45,9 +48,6 @@ ifeq ($(CONFIG),Release)
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
endif endif
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
OBJECTS := \ OBJECTS := \
$(OBJDIR)/FilterGraph_62e9c017.o \ $(OBJDIR)/FilterGraph_62e9c017.o \
$(OBJDIR)/GraphEditorPanel_3dbd4872.o \ $(OBJDIR)/GraphEditorPanel_3dbd4872.o \


+ 3
- 3
extras/binarybuilder/Builds/Linux/Makefile View File

@@ -1,6 +1,9 @@
# Automatically generated makefile, created by the Introjucer # Automatically generated makefile, created by the Introjucer
# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project! # Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
ifndef CONFIG ifndef CONFIG
CONFIG=Debug CONFIG=Debug
endif endif
@@ -45,9 +48,6 @@ ifeq ($(CONFIG),Release)
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
endif endif
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
OBJECTS := \ OBJECTS := \
$(OBJDIR)/Main_90ebc5c2.o \ $(OBJDIR)/Main_90ebc5c2.o \
$(OBJDIR)/juce_core_1ee54a40.o \ $(OBJDIR)/juce_core_1ee54a40.o \


+ 3
- 3
extras/example projects/Builds/Linux/Makefile View File

@@ -1,6 +1,9 @@
# Automatically generated makefile, created by the Introjucer # Automatically generated makefile, created by the Introjucer
# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project! # Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
ifndef CONFIG ifndef CONFIG
CONFIG=Debug CONFIG=Debug
endif endif
@@ -45,9 +48,6 @@ ifeq ($(CONFIG),Release)
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
endif endif
# (this disables dependency generation if multiple architectures are set)
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
OBJECTS := \ OBJECTS := \
$(OBJDIR)/Main_90ebc5c2.o \ $(OBJDIR)/Main_90ebc5c2.o \
$(OBJDIR)/MainComponent_a6ffb4a5.o \ $(OBJDIR)/MainComponent_a6ffb4a5.o \


Loading…
Cancel
Save