Skip to content

Commit

Permalink
dmx and serial submodules, fixed SACN and DMX module improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
benkuper committed Oct 15, 2023
1 parent 48e4ca2 commit 0a7ca81
Show file tree
Hide file tree
Showing 63 changed files with 1,049 additions and 7,563 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@
[submodule "Modules/juce_sharedtexture"]
path = Modules/juce_sharedtexture
url = https://github.com/benkuper/juce_sharedtexture
[submodule "Modules/juce_serial"]
path = Modules/juce_serial
url = https://github.com/benkuper/juce_serial
[submodule "Modules/juce_dmx"]
path = Modules/juce_dmx
url = https://github.com/benkuper/juce_dmx
58 changes: 14 additions & 44 deletions Builds/LinuxMakefile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH := -m64
endif

JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DGDK_BACKEND=x11" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.9.17b6" "-DJUCE_APP_VERSION_HEX=0x10911" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I../../Source -I../../External/wiiuse -I../../External/serial/include -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS)
JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DGDK_BACKEND=x11" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.9.17b6" "-DJUCE_APP_VERSION_HEX=0x10911" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS)
JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0"
JUCE_TARGET_APP := Chataigne

Expand All @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH := -m64
endif

JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DGDK_BACKEND=x11" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.9.17b6" "-DJUCE_APP_VERSION_HEX=0x10911" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I../../Source -I../../External/wiiuse -I../../External/serial/include -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS)
JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DGDK_BACKEND=x11" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.9.17b6" "-DJUCE_APP_VERSION_HEX=0x10911" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS)
JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0"
JUCE_TARGET_APP := Chataigne

Expand All @@ -79,15 +79,8 @@ OBJECTS_APP := \
$(JUCE_OBJDIR)/CommandIncludes_84bb7e97.o \
$(JUCE_OBJDIR)/BaseCommandHandlerEditor_d6f421f9.o \
$(JUCE_OBJDIR)/BaseCommandHandler_4d357439.o \
$(JUCE_OBJDIR)/e131_c3d02d0c.o \
$(JUCE_OBJDIR)/ProcessorIncludes_efd64865.o \
$(JUCE_OBJDIR)/ProcessorIncludes2_b12da37.o \
$(JUCE_OBJDIR)/serial_82f97e54.o \
$(JUCE_OBJDIR)/list_ports_linux_203b2613.o \
$(JUCE_OBJDIR)/list_ports_osx_d93ade33.o \
$(JUCE_OBJDIR)/list_ports_win_e6502c6b.o \
$(JUCE_OBJDIR)/unix_d5f5c79d.o \
$(JUCE_OBJDIR)/win_4c1bdbbb.o \
$(JUCE_OBJDIR)/CustomVariablesIncludes_d7a15e29.o \
$(JUCE_OBJDIR)/os_mac_a23c8a30.o \
$(JUCE_OBJDIR)/classic_e456a893.o \
Expand Down Expand Up @@ -123,6 +116,7 @@ OBJECTS_APP := \
$(JUCE_OBJDIR)/include_juce_core_f26d17db.o \
$(JUCE_OBJDIR)/include_juce_cryptography_8cb807a8.o \
$(JUCE_OBJDIR)/include_juce_data_structures_7471b1e3.o \
$(JUCE_OBJDIR)/include_juce_dmx_a4e5ae5d.o \
$(JUCE_OBJDIR)/include_juce_dsp_aeb2060f.o \
$(JUCE_OBJDIR)/include_juce_events_fd7d695.o \
$(JUCE_OBJDIR)/include_juce_graphics_f817e147.o \
Expand All @@ -135,6 +129,7 @@ OBJECTS_APP := \
$(JUCE_OBJDIR)/include_juce_organicui3_5ac6ddd0.o \
$(JUCE_OBJDIR)/include_juce_organicui4_5ad4f551.o \
$(JUCE_OBJDIR)/include_juce_osc_f3df604d.o \
$(JUCE_OBJDIR)/include_juce_serial_b0720df0.o \
$(JUCE_OBJDIR)/include_juce_sharedtexture_e491fa4.o \
$(JUCE_OBJDIR)/include_juce_simpleweb_acec7570.o \
$(JUCE_OBJDIR)/include_juce_simpleweb2_f0c24e8c.o \
Expand Down Expand Up @@ -188,11 +183,6 @@ $(JUCE_OBJDIR)/BaseCommandHandler_4d357439.o: ../../Source/Common/Command/BaseCo
@echo "Compiling BaseCommandHandler.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/e131_c3d02d0c.o: ../../Source/Common/DMX/device/sacn/e131.c
-$(V_AT)mkdir -p $(@D)
@echo "Compiling e131.c"
$(V_AT)$(CC) $(JUCE_CFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/ProcessorIncludes_efd64865.o: ../../Source/Common/Processor/ProcessorIncludes.cpp
-$(V_AT)mkdir -p $(@D)
@echo "Compiling ProcessorIncludes.cpp"
Expand All @@ -203,36 +193,6 @@ $(JUCE_OBJDIR)/ProcessorIncludes2_b12da37.o: ../../Source/Common/Processor/Proce
@echo "Compiling ProcessorIncludes2.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/serial_82f97e54.o: ../../Source/Common/Serial/lib/serial/serial.cc
-$(V_AT)mkdir -p $(@D)
@echo "Compiling serial.cc"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/list_ports_linux_203b2613.o: ../../Source/Common/Serial/lib/serial/impl/list_ports/list_ports_linux.cc
-$(V_AT)mkdir -p $(@D)
@echo "Compiling list_ports_linux.cc"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/list_ports_osx_d93ade33.o: ../../Source/Common/Serial/lib/serial/impl/list_ports/list_ports_osx.cc
-$(V_AT)mkdir -p $(@D)
@echo "Compiling list_ports_osx.cc"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/list_ports_win_e6502c6b.o: ../../Source/Common/Serial/lib/serial/impl/list_ports/list_ports_win.cc
-$(V_AT)mkdir -p $(@D)
@echo "Compiling list_ports_win.cc"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/unix_d5f5c79d.o: ../../Source/Common/Serial/lib/serial/impl/unix.cc
-$(V_AT)mkdir -p $(@D)
@echo "Compiling unix.cc"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/win_4c1bdbbb.o: ../../Source/Common/Serial/lib/serial/impl/win.cc
-$(V_AT)mkdir -p $(@D)
@echo "Compiling win.cc"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/CustomVariablesIncludes_d7a15e29.o: ../../Source/CustomVariables/CustomVariablesIncludes.cpp
-$(V_AT)mkdir -p $(@D)
@echo "Compiling CustomVariablesIncludes.cpp"
Expand Down Expand Up @@ -408,6 +368,11 @@ $(JUCE_OBJDIR)/include_juce_data_structures_7471b1e3.o: ../../JuceLibraryCode/in
@echo "Compiling include_juce_data_structures.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/include_juce_dmx_a4e5ae5d.o: ../../JuceLibraryCode/include_juce_dmx.cpp
-$(V_AT)mkdir -p $(@D)
@echo "Compiling include_juce_dmx.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/include_juce_dsp_aeb2060f.o: ../../JuceLibraryCode/include_juce_dsp.cpp
-$(V_AT)mkdir -p $(@D)
@echo "Compiling include_juce_dsp.cpp"
Expand Down Expand Up @@ -468,6 +433,11 @@ $(JUCE_OBJDIR)/include_juce_osc_f3df604d.o: ../../JuceLibraryCode/include_juce_o
@echo "Compiling include_juce_osc.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/include_juce_serial_b0720df0.o: ../../JuceLibraryCode/include_juce_serial.cpp
-$(V_AT)mkdir -p $(@D)
@echo "Compiling include_juce_serial.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/include_juce_sharedtexture_e491fa4.o: ../../JuceLibraryCode/include_juce_sharedtexture.cpp
-$(V_AT)mkdir -p $(@D)
@echo "Compiling include_juce_sharedtexture.cpp"
Expand Down
Loading

0 comments on commit 0a7ca81

Please sign in to comment.