Browse Source

Cleanup

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.1-rc1
falkTX 5 years ago
parent
commit
4b7aae363a
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
23 changed files with 183 additions and 183 deletions
  1. +12
    -12
      source/discovery/Makefile
  2. +5
    -5
      source/frontend/Makefile
  3. +8
    -8
      source/frontend/widgets/Makefile
  4. +9
    -9
      source/interposer/Makefile
  5. +2
    -2
      source/modules/Makefile
  6. +3
    -3
      source/modules/Makefile.mk
  7. +7
    -7
      source/modules/audio_decoder/Makefile
  8. +7
    -7
      source/modules/dgl/Makefile
  9. +7
    -7
      source/modules/hylia/Makefile
  10. +9
    -9
      source/modules/juce_audio_basics/Makefile
  11. +9
    -9
      source/modules/juce_audio_devices/Makefile
  12. +9
    -9
      source/modules/juce_audio_processors/Makefile
  13. +9
    -9
      source/modules/juce_core/Makefile
  14. +9
    -9
      source/modules/juce_data_structures/Makefile
  15. +9
    -9
      source/modules/juce_events/Makefile
  16. +9
    -9
      source/modules/juce_graphics/Makefile
  17. +9
    -9
      source/modules/juce_gui_basics/Makefile
  18. +9
    -9
      source/modules/juce_gui_extra/Makefile
  19. +12
    -12
      source/modules/lilv/Makefile
  20. +7
    -7
      source/modules/rtaudio/Makefile
  21. +7
    -7
      source/modules/rtmidi/Makefile
  22. +7
    -7
      source/modules/sfzero/Makefile
  23. +9
    -9
      source/modules/water/Makefile

+ 12
- 12
source/discovery/Makefile View File

@@ -14,7 +14,7 @@ CWD=..
MODULENAME=carla-discovery MODULENAME=carla-discovery
include $(CWD)/Makefile.mk include $(CWD)/Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BINDIR := $(CWD)/../bin BINDIR := $(CWD)/../bin


@@ -26,7 +26,7 @@ OBJDIR := $(CWD)/../build/discovery/Release
MODULEDIR := $(CWD)/../build/modules/Release MODULEDIR := $(CWD)/../build/modules/Release
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils BUILD_CXX_FLAGS += -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils


@@ -42,7 +42,7 @@ endif
64BIT_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH 64BIT_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH
ARM32_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH ARM32_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


NATIVE_BUILD_FLAGS = NATIVE_BUILD_FLAGS =
NATIVE_LINK_FLAGS = NATIVE_LINK_FLAGS =
@@ -52,7 +52,7 @@ NATIVE_BUILD_FLAGS += $(FLUIDSYNTH_FLAGS)
NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS)
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


LIBS_native = $(MODULEDIR)/lilv.a LIBS_native = $(MODULEDIR)/lilv.a
LIBS_arm32 = $(MODULEDIR)/lilv.arm32.a LIBS_arm32 = $(MODULEDIR)/lilv.arm32.a
@@ -125,7 +125,7 @@ LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif # MACOS endif # MACOS
endif # USING_JUCE endif # USING_JUCE


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


OBJS_native = $(OBJDIR)/$(MODULENAME).cpp.o OBJS_native = $(OBJDIR)/$(MODULENAME).cpp.o
OBJS_arm32 = $(OBJDIR)/$(MODULENAME).cpp.arm32.o OBJS_arm32 = $(OBJDIR)/$(MODULENAME).cpp.arm32.o
@@ -134,11 +134,11 @@ OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o
OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: native all: native


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(BINDIR)/$(MODULENAME)-* rm -f $(OBJDIR)/*.o $(BINDIR)/$(MODULENAME)-*
@@ -146,7 +146,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


native: $(BINDIR)/$(MODULENAME)-native$(APP_EXT) native: $(BINDIR)/$(MODULENAME)-native$(APP_EXT)
arm32: $(BINDIR)/$(MODULENAME)-arm32 arm32: $(BINDIR)/$(MODULENAME)-arm32
@@ -155,7 +155,7 @@ posix64: $(BINDIR)/$(MODULENAME)-posix64
win32: $(BINDIR)/$(MODULENAME)-win32.exe win32: $(BINDIR)/$(MODULENAME)-win32.exe
win64: $(BINDIR)/$(MODULENAME)-win64.exe win64: $(BINDIR)/$(MODULENAME)-win64.exe


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(BINDIR)/$(MODULENAME)-native: $(OBJS_native) $(LIBS_native) $(BINDIR)/$(MODULENAME)-native: $(OBJS_native) $(LIBS_native)
-@mkdir -p $(BINDIR) -@mkdir -p $(BINDIR)
@@ -195,7 +195,7 @@ $(BINDIR)/$(MODULENAME)-win64.exe: $(OBJS_win64) $(LIBS_win64)
@echo "Linking $(MODULENAME)-win64.exe" @echo "Linking $(MODULENAME)-win64.exe"
@$(CXX) $< $(LIBS_START) $(LIBS_win64) $(LIBS_END) $(LINK_FLAGS) $(64BIT_FLAGS) -o $@ @$(CXX) $< $(LIBS_START) $(LIBS_win64) $(LIBS_END) $(LINK_FLAGS) $(64BIT_FLAGS) -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -217,7 +217,7 @@ $(OBJDIR)/$(MODULENAME).cpp.arm32.o: $(MODULENAME).cpp
@echo "Compiling $< (ARM32)" @echo "Compiling $< (ARM32)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(ARM32_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(ARM32_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS_native:%.o=%.d) -include $(OBJS_native:%.o=%.d)
-include $(OBJS_arm32:%.o=%.d) -include $(OBJS_arm32:%.o=%.d)
@@ -226,4 +226,4 @@ $(OBJDIR)/$(MODULENAME).cpp.arm32.o: $(MODULENAME).cpp
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 5
- 5
source/frontend/Makefile View File

@@ -7,7 +7,7 @@
CWD=.. CWD=..
include $(CWD)/Makefile.mk include $(CWD)/Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BINDIR := $(CWD)/../bin BINDIR := $(CWD)/../bin
RESDIR := $(CWD)/../resources RESDIR := $(CWD)/../resources
@@ -80,11 +80,11 @@ RES = \
$(BINDIR)/resources/ui_inputdialog_value.py \ $(BINDIR)/resources/ui_inputdialog_value.py \
$(BINDIR)/resources/ui_midipattern.py $(BINDIR)/resources/ui_midipattern.py


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(UIs) $(RES) all: $(UIs) $(RES)


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


ui_%.py: $(RESDIR)/ui/%.ui ui_%.py: $(RESDIR)/ui/%.ui
$(PYUIC) $< -o $@ $(PYUIC) $< -o $@
@@ -95,7 +95,7 @@ resources_rc.py: $(RESDIR)/resources.qrc $(RESDIR)/*/*.png $(RESDIR)/*/*.svg
$(BINDIR)/resources/%: % $(BINDIR)/resources/%: %
$(LINK) $(CURDIR)/$* $(BINDIR)/resources/ $(LINK) $(CURDIR)/$* $(BINDIR)/resources/


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -rf $(UIs) $(RES) __pycache__ *.pyc rm -rf $(UIs) $(RES) __pycache__ *.pyc
@@ -103,4 +103,4 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 8
- 8
source/frontend/widgets/Makefile View File

@@ -7,7 +7,7 @@
CWD=.. CWD=..
include $(CWD)/Makefile.mk include $(CWD)/Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BINDIR := $(CWD)/../bin BINDIR := $(CWD)/../bin


@@ -19,7 +19,7 @@ OBJDIR := $(CWD)/../build/widgets/Release
MODULEDIR := $(CWD)/../build/modules/Release MODULEDIR := $(CWD)/../build/modules/Release
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += -I. -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils BUILD_CXX_FLAGS += -I. -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils


@@ -31,7 +31,7 @@ BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)
LINK_FLAGS += $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) LINK_FLAGS += $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets)
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


# FILES = \ # FILES = \
# moc_paramspinbox.cpp \ # moc_paramspinbox.cpp \
@@ -51,11 +51,11 @@ OBJS = \


TARGET = $(MODULEDIR)/widgets.a TARGET = $(MODULEDIR)/widgets.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(TARGET) all: $(TARGET)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(TARGET) rm -f $(OBJDIR)/*.o $(TARGET)
@@ -63,13 +63,13 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/widgets.a: $(FILES) $(OBJS) $(MODULEDIR)/widgets.a: $(FILES) $(OBJS)
$(RM) $@ $(RM) $@
$(AR) crs $@ $(OBJS) $(AR) crs $@ $(OBJS)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/%.cpp.o: %.cpp $(OBJDIR)/%.cpp.o: %.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -84,4 +84,4 @@ $(OBJDIR)/%.cpp.o: %.cpp
# moc_%.cpp: %.hpp # moc_%.cpp: %.hpp
# $(MOC) $< -o $@ # $(MOC) $< -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 9
- 9
source/interposer/Makefile View File

@@ -7,7 +7,7 @@
CWD=.. CWD=..
include $(CWD)/Makefile.mk include $(CWD)/Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BINDIR := $(CWD)/../bin BINDIR := $(CWD)/../bin


@@ -19,14 +19,14 @@ OBJDIR := $(CWD)/../build/interposer/Release
MODULEDIR := $(CWD)/../build/modules/Release MODULEDIR := $(CWD)/../build/modules/Release
endif endif


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += -I$(CWD) -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils BUILD_CXX_FLAGS += -I$(CWD) -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils


INTERPOSER_SAFE_LIBS = $(LIBDL_LIBS) INTERPOSER_SAFE_LIBS = $(LIBDL_LIBS)
INTERPOSER_X11_LIBS = $(X11_LIBS) $(LIBDL_LIBS) INTERPOSER_X11_LIBS = $(X11_LIBS) $(LIBDL_LIBS)


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


OBJS = OBJS =
TARGETS = TARGETS =
@@ -43,11 +43,11 @@ TARGETS += $(BINDIR)/libcarla_interposer-jack-x11.so
endif endif
endif endif


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(TARGETS) all: $(TARGETS)


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(TARGETS) rm -f $(OBJDIR)/*.o $(TARGETS)
@@ -55,7 +55,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(BINDIR)/libcarla_interposer-safe.so: $(OBJDIR)/interposer-safe.cpp.o $(BINDIR)/libcarla_interposer-safe.so: $(OBJDIR)/interposer-safe.cpp.o
-@mkdir -p $(BINDIR) -@mkdir -p $(BINDIR)
@@ -72,7 +72,7 @@ $(BINDIR)/libcarla_interposer-jack-x11.so: $(OBJDIR)/interposer-jack-x11.cpp.o
@echo "Linking libcarla_interposer-jack-x11.so" @echo "Linking libcarla_interposer-jack-x11.so"
@$(CXX) $< $(SHARED) $(LINK_FLAGS) $(INTERPOSER_X11_LIBS) -o $@ @$(CXX) $< $(SHARED) $(LINK_FLAGS) $(INTERPOSER_X11_LIBS) -o $@


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/interposer-safe.cpp.o: interposer-safe.cpp $(OBJDIR)/interposer-safe.cpp.o: interposer-safe.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -89,8 +89,8 @@ $(OBJDIR)/interposer-jack-x11.cpp.o: interposer-jack-x11.cpp
@echo "Compiling $<" @echo "Compiling $<"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(X11_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(X11_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 2
- 2
source/modules/Makefile View File

@@ -4,7 +4,7 @@
# Created by falkTX # Created by falkTX
# #


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: all:


@@ -28,4 +28,4 @@ clean:
$(MAKE) clean -C juce_gui_basics $(MAKE) clean -C juce_gui_basics
$(MAKE) clean -C juce_gui_extra $(MAKE) clean -C juce_gui_extra


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 3
- 3
source/modules/Makefile.mk View File

@@ -13,7 +13,7 @@ endif


include $(CWD)/Makefile.mk include $(CWD)/Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BINDIR := $(CWD)/../bin BINDIR := $(CWD)/../bin


@@ -25,9 +25,9 @@ OBJDIR := $(CWD)/../build/$(MODULENAME)/Release
MODULEDIR := $(CWD)/../build/modules/Release MODULEDIR := $(CWD)/../build/modules/Release
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_C_FLAGS += -I. -I$(CWD)/includes BUILD_C_FLAGS += -I. -I$(CWD)/includes
BUILD_CXX_FLAGS += -I. -I$(CWD)/includes -I$(CWD)/utils BUILD_CXX_FLAGS += -I. -I$(CWD)/includes -I$(CWD)/utils


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 7
- 7
source/modules/audio_decoder/Makefile View File

@@ -8,22 +8,22 @@ CWD=../..
MODULENAME=audio_decoder MODULENAME=audio_decoder
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


# BUILD_C_FLAGS += # BUILD_C_FLAGS +=


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


OBJS = \ OBJS = \
$(OBJDIR)/ad_ffmpeg.c.o \ $(OBJDIR)/ad_ffmpeg.c.o \
$(OBJDIR)/ad_plugin.c.o \ $(OBJDIR)/ad_plugin.c.o \
$(OBJDIR)/ad_soundfile.c.o $(OBJDIR)/ad_soundfile.c.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -31,7 +31,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -39,7 +39,7 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/ad_ffmpeg.c.o: ad_ffmpeg.c $(OBJDIR)/ad_ffmpeg.c.o: ad_ffmpeg.c
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -58,4 +58,4 @@ $(OBJDIR)/ad_soundfile.c.o: ad_soundfile.c


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 7
- 7
source/modules/dgl/Makefile View File

@@ -8,11 +8,11 @@ CWD=../..
MODULENAME=dgl MODULENAME=dgl
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(DGL_FLAGS) -Isrc BUILD_CXX_FLAGS += $(DGL_FLAGS) -Isrc


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


OBJS = \ OBJS = \
$(OBJDIR)/Application.cpp.o \ $(OBJDIR)/Application.cpp.o \
@@ -38,12 +38,12 @@ OBJS_wine = \
$(OBJDIR)/Widget.cpp-wine.o \ $(OBJDIR)/Widget.cpp-wine.o \
$(OBJDIR)/Window.cpp-wine.o $(OBJDIR)/Window.cpp-wine.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a
wine: $(MODULEDIR)/$(MODULENAME).wine.a wine: $(MODULEDIR)/$(MODULENAME).wine.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a $(MODULEDIR)/$(MODULENAME).wine.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a $(MODULEDIR)/$(MODULENAME).wine.a
@@ -51,7 +51,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -65,7 +65,7 @@ $(MODULEDIR)/$(MODULENAME).wine.a: $(OBJS_wine)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/%.cpp.o: src/%.cpp $(OBJDIR)/%.cpp.o: src/%.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -85,4 +85,4 @@ $(OBJDIR)/Window.mm.o: src/Window.cpp
-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_wine:%.o=%.d) -include $(OBJS_wine:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 7
- 7
source/modules/hylia/Makefile View File

@@ -8,21 +8,21 @@ CWD=../..
MODULENAME=hylia MODULENAME=hylia
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(HYLIA_FLAGS) -I$(CWD) -Ilink BUILD_CXX_FLAGS += $(HYLIA_FLAGS) -I$(CWD) -Ilink
BUILD_CXX_FLAGS += -Wno-multichar -Wno-unused-parameter -Wno-unused-variable -Wno-uninitialized BUILD_CXX_FLAGS += -Wno-multichar -Wno-unused-parameter -Wno-unused-variable -Wno-uninitialized
BUILD_CXX_FLAGS += -Wno-missing-field-initializers BUILD_CXX_FLAGS += -Wno-missing-field-initializers


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


OBJS = $(OBJDIR)/hylia.cpp.o OBJS = $(OBJDIR)/hylia.cpp.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -30,7 +30,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -38,7 +38,7 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/%.cpp.o: %.cpp $(OBJDIR)/%.cpp.o: %.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -47,4 +47,4 @@ $(OBJDIR)/%.cpp.o: %.cpp


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 9
- 9
source/modules/juce_audio_basics/Makefile View File

@@ -8,11 +8,11 @@ CWD=../..
MODULENAME=juce_audio_basics MODULENAME=juce_audio_basics
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(JUCE_AUDIO_BASICS_FLAGS) -I.. BUILD_CXX_FLAGS += $(JUCE_AUDIO_BASICS_FLAGS) -I..


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)
OBJS = $(OBJDIR)/$(MODULENAME).mm.o OBJS = $(OBJDIR)/$(MODULENAME).mm.o
@@ -26,7 +26,7 @@ endif
OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o
OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a
posix32: $(MODULEDIR)/$(MODULENAME).posix32.a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
@@ -34,7 +34,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
win32: $(MODULEDIR)/$(MODULENAME).win32.a win32: $(MODULEDIR)/$(MODULENAME).win32.a
win64: $(MODULEDIR)/$(MODULENAME).win64.a win64: $(MODULEDIR)/$(MODULENAME).win64.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -42,7 +42,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -74,7 +74,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -91,7 +91,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -108,7 +108,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_posix32:%.o=%.d) -include $(OBJS_posix32:%.o=%.d)
@@ -116,4 +116,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 9
- 9
source/modules/juce_audio_devices/Makefile View File

@@ -8,7 +8,7 @@ CWD=../..
MODULENAME=juce_audio_devices MODULENAME=juce_audio_devices
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(JUCE_AUDIO_DEVICES_FLAGS) -I.. BUILD_CXX_FLAGS += $(JUCE_AUDIO_DEVICES_FLAGS) -I..


@@ -18,7 +18,7 @@ BUILD_CXX_FLAGS += -Wno-missing-field-initializers
BUILD_CXX_FLAGS += -I$(CWD)/modules/rtaudio/include BUILD_CXX_FLAGS += -I$(CWD)/modules/rtaudio/include
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)
OBJS = $(OBJDIR)/$(MODULENAME).mm.o OBJS = $(OBJDIR)/$(MODULENAME).mm.o
@@ -32,7 +32,7 @@ endif
OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o
OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a
posix32: $(MODULEDIR)/$(MODULENAME).posix32.a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
@@ -40,7 +40,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
win32: $(MODULEDIR)/$(MODULENAME).win32.a win32: $(MODULEDIR)/$(MODULENAME).win32.a
win64: $(MODULEDIR)/$(MODULENAME).win64.a win64: $(MODULEDIR)/$(MODULENAME).win64.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -48,7 +48,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -80,7 +80,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -97,7 +97,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -114,7 +114,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_posix32:%.o=%.d) -include $(OBJS_posix32:%.o=%.d)
@@ -122,4 +122,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 9
- 9
source/modules/juce_audio_processors/Makefile View File

@@ -8,7 +8,7 @@ CWD=../..
MODULENAME=juce_audio_processors MODULENAME=juce_audio_processors
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(JUCE_AUDIO_PROCESSORS_FLAGS) -I$(CWD)/includes/vst3sdk -I.. BUILD_CXX_FLAGS += $(JUCE_AUDIO_PROCESSORS_FLAGS) -I$(CWD)/includes/vst3sdk -I..


@@ -28,7 +28,7 @@ BUILD_CXX_FLAGS += -D_NATIVE_WCHAR_T_DEFINED -D__wchar_t=wchar_t -fpermissive
endif endif
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)
OBJS = $(OBJDIR)/$(MODULENAME).mm.o OBJS = $(OBJDIR)/$(MODULENAME).mm.o
@@ -42,7 +42,7 @@ endif
OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o
OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a
posix32: $(MODULEDIR)/$(MODULENAME).posix32.a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
@@ -50,7 +50,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
win32: $(MODULEDIR)/$(MODULENAME).win32.a win32: $(MODULEDIR)/$(MODULENAME).win32.a
win64: $(MODULEDIR)/$(MODULENAME).win64.a win64: $(MODULEDIR)/$(MODULENAME).win64.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -58,7 +58,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -90,7 +90,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -107,7 +107,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -124,7 +124,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_posix32:%.o=%.d) -include $(OBJS_posix32:%.o=%.d)
@@ -132,4 +132,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 9
- 9
source/modules/juce_core/Makefile View File

@@ -8,7 +8,7 @@ CWD=../..
MODULENAME=juce_core MODULENAME=juce_core
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(JUCE_CORE_FLAGS) -I.. BUILD_CXX_FLAGS += $(JUCE_CORE_FLAGS) -I..


@@ -16,7 +16,7 @@ ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -w BUILD_CXX_FLAGS += -w
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)
OBJS = $(OBJDIR)/$(MODULENAME).mm.o OBJS = $(OBJDIR)/$(MODULENAME).mm.o
@@ -30,7 +30,7 @@ endif
OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o
OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a
posix32: $(MODULEDIR)/$(MODULENAME).posix32.a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
@@ -38,7 +38,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
win32: $(MODULEDIR)/$(MODULENAME).win32.a win32: $(MODULEDIR)/$(MODULENAME).win32.a
win64: $(MODULEDIR)/$(MODULENAME).win64.a win64: $(MODULEDIR)/$(MODULENAME).win64.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -46,7 +46,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -78,7 +78,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -95,7 +95,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -112,7 +112,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_posix32:%.o=%.d) -include $(OBJS_posix32:%.o=%.d)
@@ -120,4 +120,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 9
- 9
source/modules/juce_data_structures/Makefile View File

@@ -8,11 +8,11 @@ CWD=../..
MODULENAME=juce_data_structures MODULENAME=juce_data_structures
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(JUCE_DATA_STRUCTURES_FLAGS) -I.. BUILD_CXX_FLAGS += $(JUCE_DATA_STRUCTURES_FLAGS) -I..


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)
OBJS = $(OBJDIR)/$(MODULENAME).mm.o OBJS = $(OBJDIR)/$(MODULENAME).mm.o
@@ -26,7 +26,7 @@ endif
OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o
OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a
posix32: $(MODULEDIR)/$(MODULENAME).posix32.a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
@@ -34,7 +34,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
win32: $(MODULEDIR)/$(MODULENAME).win32.a win32: $(MODULEDIR)/$(MODULENAME).win32.a
win64: $(MODULEDIR)/$(MODULENAME).win64.a win64: $(MODULEDIR)/$(MODULENAME).win64.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -42,7 +42,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -74,7 +74,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -91,7 +91,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -108,7 +108,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_posix32:%.o=%.d) -include $(OBJS_posix32:%.o=%.d)
@@ -116,4 +116,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 9
- 9
source/modules/juce_events/Makefile View File

@@ -8,7 +8,7 @@ CWD=../..
MODULENAME=juce_events MODULENAME=juce_events
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(JUCE_EVENTS_FLAGS) -I.. BUILD_CXX_FLAGS += $(JUCE_EVENTS_FLAGS) -I..


@@ -16,7 +16,7 @@ ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -Wno-missing-field-initializers BUILD_CXX_FLAGS += -Wno-missing-field-initializers
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)
OBJS = $(OBJDIR)/$(MODULENAME).mm.o OBJS = $(OBJDIR)/$(MODULENAME).mm.o
@@ -30,7 +30,7 @@ endif
OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o
OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a
posix32: $(MODULEDIR)/$(MODULENAME).posix32.a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
@@ -38,7 +38,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
win32: $(MODULEDIR)/$(MODULENAME).win32.a win32: $(MODULEDIR)/$(MODULENAME).win32.a
win64: $(MODULEDIR)/$(MODULENAME).win64.a win64: $(MODULEDIR)/$(MODULENAME).win64.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -46,7 +46,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -78,7 +78,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -95,7 +95,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -112,7 +112,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_posix32:%.o=%.d) -include $(OBJS_posix32:%.o=%.d)
@@ -120,4 +120,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 9
- 9
source/modules/juce_graphics/Makefile View File

@@ -8,7 +8,7 @@ CWD=../..
MODULENAME=juce_graphics MODULENAME=juce_graphics
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(JUCE_GRAPHICS_FLAGS) -I.. BUILD_CXX_FLAGS += $(JUCE_GRAPHICS_FLAGS) -I..


@@ -19,7 +19,7 @@ ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -Wno-missing-field-initializers -Wno-strict-overflow BUILD_CXX_FLAGS += -Wno-missing-field-initializers -Wno-strict-overflow
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)
OBJS = $(OBJDIR)/$(MODULENAME).mm.o OBJS = $(OBJDIR)/$(MODULENAME).mm.o
@@ -33,7 +33,7 @@ endif
OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o
OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a
posix32: $(MODULEDIR)/$(MODULENAME).posix32.a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
@@ -41,7 +41,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
win32: $(MODULEDIR)/$(MODULENAME).win32.a win32: $(MODULEDIR)/$(MODULENAME).win32.a
win64: $(MODULEDIR)/$(MODULENAME).win64.a win64: $(MODULEDIR)/$(MODULENAME).win64.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -49,7 +49,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -81,7 +81,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -98,7 +98,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -115,7 +115,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_posix32:%.o=%.d) -include $(OBJS_posix32:%.o=%.d)
@@ -123,4 +123,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 9
- 9
source/modules/juce_gui_basics/Makefile View File

@@ -8,7 +8,7 @@ CWD=../..
MODULENAME=juce_gui_basics MODULENAME=juce_gui_basics
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(JUCE_GUI_BASICS_FLAGS) -I.. BUILD_CXX_FLAGS += $(JUCE_GUI_BASICS_FLAGS) -I..


@@ -16,7 +16,7 @@ ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-strict-overflow BUILD_CXX_FLAGS += -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-strict-overflow
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)
OBJS = $(OBJDIR)/$(MODULENAME).mm.o OBJS = $(OBJDIR)/$(MODULENAME).mm.o
@@ -30,7 +30,7 @@ endif
OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o
OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a
posix32: $(MODULEDIR)/$(MODULENAME).posix32.a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
@@ -38,7 +38,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
win32: $(MODULEDIR)/$(MODULENAME).win32.a win32: $(MODULEDIR)/$(MODULENAME).win32.a
win64: $(MODULEDIR)/$(MODULENAME).win64.a win64: $(MODULEDIR)/$(MODULENAME).win64.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -46,7 +46,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -78,7 +78,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -95,7 +95,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -112,7 +112,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_posix32:%.o=%.d) -include $(OBJS_posix32:%.o=%.d)
@@ -120,4 +120,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 9
- 9
source/modules/juce_gui_extra/Makefile View File

@@ -8,11 +8,11 @@ CWD=../..
MODULENAME=juce_gui_extra MODULENAME=juce_gui_extra
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(JUCE_GUI_EXTRA_FLAGS) -I.. BUILD_CXX_FLAGS += $(JUCE_GUI_EXTRA_FLAGS) -I..


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)
OBJS = $(OBJDIR)/$(MODULENAME).mm.o OBJS = $(OBJDIR)/$(MODULENAME).mm.o
@@ -26,7 +26,7 @@ endif
OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o
OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a
posix32: $(MODULEDIR)/$(MODULENAME).posix32.a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
@@ -34,7 +34,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
win32: $(MODULEDIR)/$(MODULENAME).win32.a win32: $(MODULEDIR)/$(MODULENAME).win32.a
win64: $(MODULEDIR)/$(MODULENAME).win64.a win64: $(MODULEDIR)/$(MODULENAME).win64.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -42,7 +42,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -74,7 +74,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -91,7 +91,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -108,7 +108,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_posix32:%.o=%.d) -include $(OBJS_posix32:%.o=%.d)
@@ -116,4 +116,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 12
- 12
source/modules/lilv/Makefile View File

@@ -8,18 +8,18 @@ CWD=../..
MODULENAME=lilv MODULENAME=lilv
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


SERD_VERSION = 0.24.0 SERD_VERSION = 0.24.0
SORD_VERSION = 0.16.0 SORD_VERSION = 0.16.0
SRATOM_VERSION = 0.6.0 SRATOM_VERSION = 0.6.0
LILV_VERSION = 0.24.0 LILV_VERSION = 0.24.0


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_C_FLAGS += $(LILV_FLAGS) -Iconfig -w BUILD_C_FLAGS += $(LILV_FLAGS) -Iconfig -w


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


OBJS = $(OBJDIR)/serd.c.o $(OBJDIR)/sord.c.o $(OBJDIR)/sratom.c.o $(OBJDIR)/lilv.c.o OBJS = $(OBJDIR)/serd.c.o $(OBJDIR)/sord.c.o $(OBJDIR)/sratom.c.o $(OBJDIR)/lilv.c.o
OBJS_arm32 = $(OBJDIR)/serd.c.arm32.o $(OBJDIR)/sord.c.arm32.o $(OBJDIR)/sratom.c.arm32.o $(OBJDIR)/lilv.c.arm32.o OBJS_arm32 = $(OBJDIR)/serd.c.arm32.o $(OBJDIR)/sord.c.arm32.o $(OBJDIR)/sratom.c.arm32.o $(OBJDIR)/lilv.c.arm32.o
@@ -28,7 +28,7 @@ OBJS_posix64 = $(OBJDIR)/serd.c.posix64.o $(OBJDIR)/sord.c.posix64.o $(OBJDIR)/s
OBJS_win32 = $(OBJDIR)/serd.c.win32.o $(OBJDIR)/sord.c.win32.o $(OBJDIR)/sratom.c.win32.o $(OBJDIR)/lilv.c.win32.o OBJS_win32 = $(OBJDIR)/serd.c.win32.o $(OBJDIR)/sord.c.win32.o $(OBJDIR)/sratom.c.win32.o $(OBJDIR)/lilv.c.win32.o
OBJS_win64 = $(OBJDIR)/serd.c.win64.o $(OBJDIR)/sord.c.win64.o $(OBJDIR)/sratom.c.win64.o $(OBJDIR)/lilv.c.win64.o OBJS_win64 = $(OBJDIR)/serd.c.win64.o $(OBJDIR)/sord.c.win64.o $(OBJDIR)/sratom.c.win64.o $(OBJDIR)/lilv.c.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a
arm32: $(MODULEDIR)/$(MODULENAME).arm32.a arm32: $(MODULEDIR)/$(MODULENAME).arm32.a
@@ -37,7 +37,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
win32: $(MODULEDIR)/$(MODULENAME).win32.a win32: $(MODULEDIR)/$(MODULENAME).win32.a
win64: $(MODULEDIR)/$(MODULENAME).win64.a win64: $(MODULEDIR)/$(MODULENAME).win64.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -45,7 +45,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -83,7 +83,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/serd.c.o: serd.c $(OBJDIR)/serd.c.o: serd.c
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -105,7 +105,7 @@ $(OBJDIR)/serd.c.arm32.o: serd.c
@echo "Compiling $< (ARM32)" @echo "Compiling $< (ARM32)"
@$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(ARM32_FLAGS) -c -o $@ @$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(ARM32_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/sord.c.o: sord.c $(OBJDIR)/sord.c.o: sord.c
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -127,7 +127,7 @@ $(OBJDIR)/sord.c.arm32.o: sord.c
@echo "Compiling $< (ARM32)" @echo "Compiling $< (ARM32)"
@$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(ARM32_FLAGS) -c -o $@ @$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(ARM32_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/sratom.c.o: sratom.c $(OBJDIR)/sratom.c.o: sratom.c
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -149,7 +149,7 @@ $(OBJDIR)/sratom.c.arm32.o: sratom.c
@echo "Compiling $< (ARM32)" @echo "Compiling $< (ARM32)"
@$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(ARM32_FLAGS) -c -o $@ @$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(ARM32_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/lilv.c.o: lilv.c $(OBJDIR)/lilv.c.o: lilv.c
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -171,7 +171,7 @@ $(OBJDIR)/lilv.c.arm32.o: lilv.c
@echo "Compiling $< (ARM32)" @echo "Compiling $< (ARM32)"
@$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(ARM32_FLAGS) -c -o $@ @$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(ARM32_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_arm32:%.o=%.d) -include $(OBJS_arm32:%.o=%.d)
@@ -180,4 +180,4 @@ $(OBJDIR)/lilv.c.arm32.o: lilv.c
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 7
- 7
source/modules/rtaudio/Makefile View File

@@ -8,7 +8,7 @@ CWD=../..
MODULENAME=rtaudio MODULENAME=rtaudio
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(RTAUDIO_FLAGS) -I$(CWD) -Iinclude BUILD_CXX_FLAGS += $(RTAUDIO_FLAGS) -I$(CWD) -Iinclude


@@ -16,15 +16,15 @@ ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -Wno-unused-function -Wno-unused-but-set-variable BUILD_CXX_FLAGS += -Wno-unused-function -Wno-unused-but-set-variable
endif endif


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


OBJS = $(OBJDIR)/RtAudio.cpp.o OBJS = $(OBJDIR)/RtAudio.cpp.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -32,7 +32,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -40,7 +40,7 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/%.cpp.o: %.cpp $(OBJDIR)/%.cpp.o: %.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -49,4 +49,4 @@ $(OBJDIR)/%.cpp.o: %.cpp


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 7
- 7
source/modules/rtmidi/Makefile View File

@@ -8,19 +8,19 @@ CWD=../..
MODULENAME=rtmidi MODULENAME=rtmidi
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += $(RTMIDI_FLAGS) -w BUILD_CXX_FLAGS += $(RTMIDI_FLAGS) -w


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


OBJS = $(OBJDIR)/RtMidi.cpp.o OBJS = $(OBJDIR)/RtMidi.cpp.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -28,7 +28,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -36,7 +36,7 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/%.cpp.o: %.cpp $(OBJDIR)/%.cpp.o: %.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -45,4 +45,4 @@ $(OBJDIR)/%.cpp.o: %.cpp


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 7
- 7
source/modules/sfzero/Makefile View File

@@ -8,19 +8,19 @@ CWD=../..
MODULENAME=sfzero MODULENAME=sfzero
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += -I$(CWD)/modules BUILD_CXX_FLAGS += -I$(CWD)/modules


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


OBJS = $(OBJDIR)/SFZero.cpp.o OBJS = $(OBJDIR)/SFZero.cpp.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a all: $(MODULEDIR)/$(MODULENAME).a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -28,7 +28,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -36,7 +36,7 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/%.cpp.o: %.cpp $(OBJDIR)/%.cpp.o: %.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -45,4 +45,4 @@ $(OBJDIR)/%.cpp.o: %.cpp


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

+ 9
- 9
source/modules/water/Makefile View File

@@ -8,11 +8,11 @@ CWD=../..
MODULENAME=water MODULENAME=water
include ../Makefile.mk include ../Makefile.mk


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


BUILD_CXX_FLAGS += -I.. BUILD_CXX_FLAGS += -I..


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)
OBJS = $(OBJDIR)/$(MODULENAME).mm.o OBJS = $(OBJDIR)/$(MODULENAME).mm.o
@@ -29,7 +29,7 @@ endif
OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o
OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


all: $(MODULEDIR)/$(MODULENAME).a $(MODULEDIR)/$(MODULENAME).files.a all: $(MODULEDIR)/$(MODULENAME).a $(MODULEDIR)/$(MODULENAME).files.a
arm32: $(MODULEDIR)/$(MODULENAME).arm32.a arm32: $(MODULEDIR)/$(MODULENAME).arm32.a
@@ -38,7 +38,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
win32: $(MODULEDIR)/$(MODULENAME).win32.a win32: $(MODULEDIR)/$(MODULENAME).win32.a
win64: $(MODULEDIR)/$(MODULENAME).win64.a win64: $(MODULEDIR)/$(MODULENAME).win64.a


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


clean: clean:
rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
@@ -46,7 +46,7 @@ clean:
debug: debug:
$(MAKE) DEBUG=true $(MAKE) DEBUG=true


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(MODULEDIR)/$(MODULENAME).a: $(OBJS) $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-@mkdir -p $(MODULEDIR) -@mkdir -p $(MODULEDIR)
@@ -90,7 +90,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
@rm -f $@ @rm -f $@
@$(AR) crs $@ $^ @$(AR) crs $@ $^


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -117,7 +117,7 @@ $(OBJDIR)/$(MODULENAME).cpp.arm32.o: $(MODULENAME).cpp
@echo "Compiling $< (ARM32)" @echo "Compiling $< (ARM32)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(ARM32_FLAGS) -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(ARM32_FLAGS) -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).mm $(MODULENAME).cpp $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).mm $(MODULENAME).cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@@ -139,7 +139,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
@echo "Compiling $< (64bit)" @echo "Compiling $< (64bit)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------


-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
-include $(OBJS_files:%.o=%.d) -include $(OBJS_files:%.o=%.d)
@@ -149,4 +149,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-include $(OBJS_win32:%.o=%.d) -include $(OBJS_win32:%.o=%.d)
-include $(OBJS_win64:%.o=%.d) -include $(OBJS_win64:%.o=%.d)


# ----------------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------

Loading…
Cancel
Save