From 1789437168ca2625683eba8f4e9f57de70beb6af Mon Sep 17 00:00:00 2001 From: Ben Kuper Date: Tue, 8 Oct 2024 19:30:09 +0200 Subject: [PATCH] fix juce branch --- Builds/LinuxMakefile/Makefile | 28 +---- .../Chataigne.xcodeproj/project.pbxproj | 12 -- .../Chataigne.xcodeproj/project.pbxproj | 12 -- Builds/Raspberry/Makefile | 28 +---- Builds/Raspberry64/Makefile | 28 +---- Builds/VisualStudio2022/Chataigne_App.vcxproj | 47 +------ .../Chataigne_App.vcxproj.filters | 116 ++---------------- .../VisualStudio2022_CI/Chataigne_App.vcxproj | 47 +------ .../Chataigne_App.vcxproj.filters | 116 ++---------------- .../Chataigne_App.vcxproj | 47 +------ .../Chataigne_App.vcxproj.filters | 116 ++---------------- JuceLibraryCode/AppConfig.h | 12 +- .../include_juce_core_CompilationTime.cpp | 9 -- .../include_juce_graphics_Harfbuzz.cpp | 9 -- .../include_juce_graphics_Sheenbidi.c | 9 -- 15 files changed, 71 insertions(+), 565 deletions(-) delete mode 100644 JuceLibraryCode/include_juce_core_CompilationTime.cpp delete mode 100644 JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp delete mode 100644 JuceLibraryCode/include_juce_graphics_Sheenbidi.c diff --git a/Builds/LinuxMakefile/Makefile b/Builds/LinuxMakefile/Makefile index 87ffb947e..9952b9466 100644 --- a/Builds/LinuxMakefile/Makefile +++ b/Builds/LinuxMakefile/Makefile @@ -39,13 +39,13 @@ 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.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(shell $(PKG_CONFIG) --cflags alsa freetype2 fontconfig 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 := $(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.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(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 JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -Wno-multichar $(CFLAGS) JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++17 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/linux -L../../External/sdl/lib/linux -L/usr/lib/x86_64-linux-gnu/ -L../../External/joycon/lib/linux -L../../Modules/juce_simpleweb/libs/Linux/x86_64 $(shell $(PKG_CONFIG) --libs alsa freetype2 fontconfig gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lJoyShockLibrary $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/linux -L../../External/sdl/lib/linux -L/usr/lib/x86_64-linux-gnu/ -L../../External/joycon/lib/linux -L../../Modules/juce_simpleweb/libs/Linux/x86_64 $(shell $(PKG_CONFIG) --libs alsa freetype2 gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lJoyShockLibrary $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(JUCE_OBJDIR) endif @@ -60,13 +60,13 @@ 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.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(shell $(PKG_CONFIG) --cflags alsa freetype2 fontconfig 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 := $(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.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(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 JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -Wno-multichar $(CFLAGS) JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++17 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/linux -L../../External/sdl/lib/linux -L/usr/lib/x86_64-linux-gnu/ -L../../External/joycon/lib/linux -L../../Modules/juce_simpleweb/libs/Linux/x86_64 $(shell $(PKG_CONFIG) --libs alsa freetype2 fontconfig gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lJoyShockLibrary $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/linux -L../../External/sdl/lib/linux -L/usr/lib/x86_64-linux-gnu/ -L../../External/joycon/lib/linux -L../../Modules/juce_simpleweb/libs/Linux/x86_64 $(shell $(PKG_CONFIG) --libs alsa freetype2 gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lJoyShockLibrary $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(JUCE_OBJDIR) endif @@ -114,15 +114,12 @@ OBJECTS_APP := \ $(JUCE_OBJDIR)/include_juce_audio_processors_lv2_libs_12bdca08.o \ $(JUCE_OBJDIR)/include_juce_audio_utils_9f9fb2d6.o \ $(JUCE_OBJDIR)/include_juce_core_f26d17db.o \ - $(JUCE_OBJDIR)/include_juce_core_CompilationTime_9257742c.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 \ - $(JUCE_OBJDIR)/include_juce_graphics_Harfbuzz_60c52ba2.o \ - $(JUCE_OBJDIR)/include_juce_graphics_Sheenbidi_c310974d.o \ $(JUCE_OBJDIR)/include_juce_gui_basics_e3f79785.o \ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o \ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o \ @@ -144,7 +141,7 @@ all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(JUCE_OBJDIR)/execinfo.cmd $(RESOURCES) @command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @$(PKG_CONFIG) --print-errors alsa freetype2 fontconfig gl libcurl + @$(PKG_CONFIG) --print-errors alsa freetype2 gl libcurl @echo Linking "Chataigne - App" -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) @@ -361,11 +358,6 @@ $(JUCE_OBJDIR)/include_juce_core_f26d17db.o: ../../JuceLibraryCode/include_juce_ @echo "Compiling include_juce_core.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -$(JUCE_OBJDIR)/include_juce_core_CompilationTime_9257742c.o: ../../JuceLibraryCode/include_juce_core_CompilationTime.cpp - -$(V_AT)mkdir -p $(@D) - @echo "Compiling include_juce_core_CompilationTime.cpp" - $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" - $(JUCE_OBJDIR)/include_juce_cryptography_8cb807a8.o: ../../JuceLibraryCode/include_juce_cryptography.cpp -$(V_AT)mkdir -p $(@D) @echo "Compiling include_juce_cryptography.cpp" @@ -396,16 +388,6 @@ $(JUCE_OBJDIR)/include_juce_graphics_f817e147.o: ../../JuceLibraryCode/include_j @echo "Compiling include_juce_graphics.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -$(JUCE_OBJDIR)/include_juce_graphics_Harfbuzz_60c52ba2.o: ../../JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp - -$(V_AT)mkdir -p $(@D) - @echo "Compiling include_juce_graphics_Harfbuzz.cpp" - $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" - -$(JUCE_OBJDIR)/include_juce_graphics_Sheenbidi_c310974d.o: ../../JuceLibraryCode/include_juce_graphics_Sheenbidi.c - -$(V_AT)mkdir -p $(@D) - @echo "Compiling include_juce_graphics_Sheenbidi.c" - $(V_AT)$(CC) $(JUCE_CFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" - $(JUCE_OBJDIR)/include_juce_gui_basics_e3f79785.o: ../../JuceLibraryCode/include_juce_gui_basics.cpp -$(V_AT)mkdir -p $(@D) @echo "Compiling include_juce_gui_basics.cpp" diff --git a/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj b/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj index c68aad0de..dafd5cc36 100644 --- a/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj @@ -12,8 +12,6 @@ 14B03BE884B82BE8EC264AE9 /* include_juce_simpleweb.cpp */ = {isa = PBXBuildFile; fileRef = A344ECDA05A5372A32341886; }; 1E38E7F8E4ECF0F020101DF4 /* include_juce_audio_processors_lv2_libs.cpp */ = {isa = PBXBuildFile; fileRef = DE62E8E7E1EBB5191F56029B; }; 212B67A3534DE8B8475EFD36 /* include_juce_organicui2.cpp */ = {isa = PBXBuildFile; fileRef = 03B34F65CD67AA62113F23C3; }; - 216A21D06E923B13A5B3E6B5 /* include_juce_graphics_Sheenbidi.c */ = {isa = PBXBuildFile; fileRef = B6DACF38E3774C2D798157C4; }; - 21919F55110B8DBF3FC8D49F /* include_juce_graphics_Harfbuzz.cpp */ = {isa = PBXBuildFile; fileRef = 08727B1936C15CAECD0131E0; }; 2231890C46C454B84C7D5049 /* include_juce_opengl.mm */ = {isa = PBXBuildFile; fileRef = F4590876F89E291434F6B792; }; 2270C7A2C18C1C8F04F83D18 /* include_juce_organicui.cpp */ = {isa = PBXBuildFile; fileRef = 066DA60AFB60B8BE77E819E7; }; 22C2EDFBB5E20006B8E3D8AF /* include_juce_data_structures.mm */ = {isa = PBXBuildFile; fileRef = B0A212BED0377CF2A9B29C3F; }; @@ -78,7 +76,6 @@ CCD9A22929C0C3B17DBDECFC /* BinaryData.cpp */ = {isa = PBXBuildFile; fileRef = 8E161399DEC1EED4622B6EE6; }; CD1179FB5FFCDF7733DE6D99 /* io.c */ = {isa = PBXBuildFile; fileRef = 66FB3CD683B9EE7A37CC2C5D; }; CEF52996937104AFE201FA08 /* include_juce_audio_processors.mm */ = {isa = PBXBuildFile; fileRef = 14E5D0E29E9A6BEAD9C32A03; }; - D14A9A8E117FC61C24270B27 /* include_juce_core_CompilationTime.cpp */ = {isa = PBXBuildFile; fileRef = FA0BBA4178B54CE33B70F744; }; D553CB88C72C0B51E97A4676 /* IOKit.framework */ = {isa = PBXBuildFile; fileRef = 7335A92ACDE20B14F02ADA97; }; D9D175B4BD9D9E379D7B0842 /* include_juce_simpleweb2.cpp */ = {isa = PBXBuildFile; fileRef = BF6D9D661141F04A04FFE925; }; DA910C499A52C803D9A9158E /* include_juce_cryptography.mm */ = {isa = PBXBuildFile; fileRef = C6D2FE7E6817726C8813E755; }; @@ -146,7 +143,6 @@ 074C067EBC69776F87BBCDD0 /* FFTAnalyzerEditor.h */ /* FFTAnalyzerEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FFTAnalyzerEditor.h; path = ../../Source/Module/modules/audio/analysis/ui/FFTAnalyzerEditor.h; sourceTree = SOURCE_ROOT; }; 07AB011925F95832C5B2D642 /* TCPServerModule.h */ /* TCPServerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TCPServerModule.h; path = ../../Source/Module/modules/tcp/tcpserver/TCPServerModule.h; sourceTree = SOURCE_ROOT; }; 0835723566717978DA39C93A /* ConductorCue.cpp */ /* ConductorCue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ConductorCue.cpp; path = ../../Source/Common/Processor/Conductor/ConductorCue.cpp; sourceTree = SOURCE_ROOT; }; - 08727B1936C15CAECD0131E0 /* include_juce_graphics_Harfbuzz.cpp */ /* include_juce_graphics_Harfbuzz.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_graphics_Harfbuzz.cpp; path = ../../JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp; sourceTree = SOURCE_ROOT; }; 09E3B9DC39267AB5D9BAD384 /* StateTransition.cpp */ /* StateTransition.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StateTransition.cpp; path = ../../Source/StateMachine/Transition/StateTransition.cpp; sourceTree = SOURCE_ROOT; }; 09F517E8BB12782E3FF11E32 /* ConditionEditor.cpp */ /* ConditionEditor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ConditionEditor.cpp; path = ../../Source/Common/Processor/Action/Condition/ui/ConditionEditor.cpp; sourceTree = SOURCE_ROOT; }; 09F8E8D2AE008C1F9AD215F6 /* SendStreamStringValuesCommand.h */ /* SendStreamStringValuesCommand.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SendStreamStringValuesCommand.h; path = ../../Source/Module/modules/common/streaming/commands/SendStreamStringValuesCommand.h; sourceTree = SOURCE_ROOT; }; @@ -711,7 +707,6 @@ B659B9A2F92F0E7A59C628DD /* CommandTemplateManager.cpp */ /* CommandTemplateManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandTemplateManager.cpp; path = ../../Source/Common/Command/Template/CommandTemplateManager.cpp; sourceTree = SOURCE_ROOT; }; B68AA40E425DF28AFA78226B /* InputSystemManager.cpp */ /* InputSystemManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = InputSystemManager.cpp; path = ../../Source/Common/InputSystem/InputSystemManager.cpp; sourceTree = SOURCE_ROOT; }; B6A29DF2E614A624B07ADD6A /* DMXModule.h */ /* DMXModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DMXModule.h; path = ../../Source/Module/modules/dmx/DMXModule.h; sourceTree = SOURCE_ROOT; }; - B6DACF38E3774C2D798157C4 /* include_juce_graphics_Sheenbidi.c */ /* include_juce_graphics_Sheenbidi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = include_juce_graphics_Sheenbidi.c; path = ../../JuceLibraryCode/include_juce_graphics_Sheenbidi.c; sourceTree = SOURCE_ROOT; }; B7037B1303B113B3EB738DE2 /* os_mac_interface.m */ /* os_mac_interface.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = os_mac_interface.m; path = ../../Source/Module/modules/controller/wiimote/lib/wiiuse/os_mac/os_mac_interface.m; sourceTree = SOURCE_ROOT; }; B7BBA4821B4CAD95A467E9DE /* Condition.cpp */ /* Condition.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Condition.cpp; path = ../../Source/Common/Processor/Action/Condition/Condition.cpp; sourceTree = SOURCE_ROOT; }; B84FB7144270D3572B5D9239 /* BaseCommandHandlerEditor.h */ /* BaseCommandHandlerEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BaseCommandHandlerEditor.h; path = ../../Source/Common/Command/ui/BaseCommandHandlerEditor.h; sourceTree = SOURCE_ROOT; }; @@ -927,7 +922,6 @@ F85193CCD2CCA1D72CDCA8D7 /* CommandChooserUI.h */ /* CommandChooserUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CommandChooserUI.h; path = ../../Source/Common/Command/ui/CommandChooserUI.h; sourceTree = SOURCE_ROOT; }; F8E7D02E47F748ADED4BD659 /* server.key */ /* server.key */ = {isa = PBXFileReference; lastKnownFileType = file.key; name = server.key; path = ../../Resources/server/server.key; sourceTree = SOURCE_ROOT; }; F99233D6C8A37D46D317C05B /* NumberComparators.h */ /* NumberComparators.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = NumberComparators.h; path = ../../Source/Common/Processor/Action/Condition/conditions/StandardCondition/Comparator/comparators/NumberComparators.h; sourceTree = SOURCE_ROOT; }; - FA0BBA4178B54CE33B70F744 /* include_juce_core_CompilationTime.cpp */ /* include_juce_core_CompilationTime.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_core_CompilationTime.cpp; path = ../../JuceLibraryCode/include_juce_core_CompilationTime.cpp; sourceTree = SOURCE_ROOT; }; FA28A6E3D992D8E5E14F097E /* StreamDeckCommand.cpp */ /* StreamDeckCommand.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StreamDeckCommand.cpp; path = ../../Source/Module/modules/controller/streamdeck/commands/StreamDeckCommand.cpp; sourceTree = SOURCE_ROOT; }; FA4C14B931E890BB595FF1AA /* ChataigneSequence.h */ /* ChataigneSequence.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ChataigneSequence.h; path = ../../Source/TimeMachine/Sequence/ChataigneSequence.h; sourceTree = SOURCE_ROOT; }; FB08FF8FEEDEA3EB452AD6A8 /* config.h */ /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../../Source/Common/LTC/config.h; sourceTree = SOURCE_ROOT; }; @@ -1363,15 +1357,12 @@ DE62E8E7E1EBB5191F56029B, 8802698D52924F5FAB243444, 46F2EDE77746DD3B70BA3157, - FA0BBA4178B54CE33B70F744, C6D2FE7E6817726C8813E755, B0A212BED0377CF2A9B29C3F, 1BB541E7AC82CF6E1A3C781C, 453B3234420A19837BF931C3, F7B87FFA7807F632CD294BA4, A166E3006BBC663DDF05DE54, - 08727B1936C15CAECD0131E0, - B6DACF38E3774C2D798157C4, 767E6C14CD8A82E65606EB02, 378FBC82648FC26CBEC330A9, F4590876F89E291434F6B792, @@ -3669,15 +3660,12 @@ 1E38E7F8E4ECF0F020101DF4, 4D75BBCB531AE4968206FB8D, 24E9DAD33ACCFA87158E4D92, - D14A9A8E117FC61C24270B27, DA910C499A52C803D9A9158E, 22C2EDFBB5E20006B8E3D8AF, 6B7CCF93B1FF252F3B4A4C2F, F51ACA7801B35A1EBA52FE8C, B7D1E9B2DB666FD0C4DA9CA2, 6E48A19DAF47B6778318F790, - 21919F55110B8DBF3FC8D49F, - 216A21D06E923B13A5B3E6B5, B84C47FC81D491DE8352F7A7, F0BB5E30719519EA30B9FD86, 2231890C46C454B84C7D5049, diff --git a/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj b/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj index c92eb2c7a..9f39be96b 100644 --- a/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj +++ b/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj @@ -12,8 +12,6 @@ 14B03BE884B82BE8EC264AE9 /* include_juce_simpleweb.cpp */ = {isa = PBXBuildFile; fileRef = A344ECDA05A5372A32341886; }; 1E38E7F8E4ECF0F020101DF4 /* include_juce_audio_processors_lv2_libs.cpp */ = {isa = PBXBuildFile; fileRef = DE62E8E7E1EBB5191F56029B; }; 212B67A3534DE8B8475EFD36 /* include_juce_organicui2.cpp */ = {isa = PBXBuildFile; fileRef = 03B34F65CD67AA62113F23C3; }; - 216A21D06E923B13A5B3E6B5 /* include_juce_graphics_Sheenbidi.c */ = {isa = PBXBuildFile; fileRef = B6DACF38E3774C2D798157C4; }; - 21919F55110B8DBF3FC8D49F /* include_juce_graphics_Harfbuzz.cpp */ = {isa = PBXBuildFile; fileRef = 08727B1936C15CAECD0131E0; }; 2231890C46C454B84C7D5049 /* include_juce_opengl.mm */ = {isa = PBXBuildFile; fileRef = F4590876F89E291434F6B792; }; 2270C7A2C18C1C8F04F83D18 /* include_juce_organicui.cpp */ = {isa = PBXBuildFile; fileRef = 066DA60AFB60B8BE77E819E7; }; 22C2EDFBB5E20006B8E3D8AF /* include_juce_data_structures.mm */ = {isa = PBXBuildFile; fileRef = B0A212BED0377CF2A9B29C3F; }; @@ -78,7 +76,6 @@ CCD9A22929C0C3B17DBDECFC /* BinaryData.cpp */ = {isa = PBXBuildFile; fileRef = 8E161399DEC1EED4622B6EE6; }; CD1179FB5FFCDF7733DE6D99 /* io.c */ = {isa = PBXBuildFile; fileRef = 66FB3CD683B9EE7A37CC2C5D; }; CEF52996937104AFE201FA08 /* include_juce_audio_processors.mm */ = {isa = PBXBuildFile; fileRef = 14E5D0E29E9A6BEAD9C32A03; }; - D14A9A8E117FC61C24270B27 /* include_juce_core_CompilationTime.cpp */ = {isa = PBXBuildFile; fileRef = FA0BBA4178B54CE33B70F744; }; D553CB88C72C0B51E97A4676 /* IOKit.framework */ = {isa = PBXBuildFile; fileRef = 7335A92ACDE20B14F02ADA97; }; D9D175B4BD9D9E379D7B0842 /* include_juce_simpleweb2.cpp */ = {isa = PBXBuildFile; fileRef = BF6D9D661141F04A04FFE925; }; DA910C499A52C803D9A9158E /* include_juce_cryptography.mm */ = {isa = PBXBuildFile; fileRef = C6D2FE7E6817726C8813E755; }; @@ -146,7 +143,6 @@ 074C067EBC69776F87BBCDD0 /* FFTAnalyzerEditor.h */ /* FFTAnalyzerEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FFTAnalyzerEditor.h; path = ../../Source/Module/modules/audio/analysis/ui/FFTAnalyzerEditor.h; sourceTree = SOURCE_ROOT; }; 07AB011925F95832C5B2D642 /* TCPServerModule.h */ /* TCPServerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TCPServerModule.h; path = ../../Source/Module/modules/tcp/tcpserver/TCPServerModule.h; sourceTree = SOURCE_ROOT; }; 0835723566717978DA39C93A /* ConductorCue.cpp */ /* ConductorCue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ConductorCue.cpp; path = ../../Source/Common/Processor/Conductor/ConductorCue.cpp; sourceTree = SOURCE_ROOT; }; - 08727B1936C15CAECD0131E0 /* include_juce_graphics_Harfbuzz.cpp */ /* include_juce_graphics_Harfbuzz.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_graphics_Harfbuzz.cpp; path = ../../JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp; sourceTree = SOURCE_ROOT; }; 09E3B9DC39267AB5D9BAD384 /* StateTransition.cpp */ /* StateTransition.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StateTransition.cpp; path = ../../Source/StateMachine/Transition/StateTransition.cpp; sourceTree = SOURCE_ROOT; }; 09F517E8BB12782E3FF11E32 /* ConditionEditor.cpp */ /* ConditionEditor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ConditionEditor.cpp; path = ../../Source/Common/Processor/Action/Condition/ui/ConditionEditor.cpp; sourceTree = SOURCE_ROOT; }; 09F8E8D2AE008C1F9AD215F6 /* SendStreamStringValuesCommand.h */ /* SendStreamStringValuesCommand.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SendStreamStringValuesCommand.h; path = ../../Source/Module/modules/common/streaming/commands/SendStreamStringValuesCommand.h; sourceTree = SOURCE_ROOT; }; @@ -710,7 +706,6 @@ B659B9A2F92F0E7A59C628DD /* CommandTemplateManager.cpp */ /* CommandTemplateManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandTemplateManager.cpp; path = ../../Source/Common/Command/Template/CommandTemplateManager.cpp; sourceTree = SOURCE_ROOT; }; B68AA40E425DF28AFA78226B /* InputSystemManager.cpp */ /* InputSystemManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = InputSystemManager.cpp; path = ../../Source/Common/InputSystem/InputSystemManager.cpp; sourceTree = SOURCE_ROOT; }; B6A29DF2E614A624B07ADD6A /* DMXModule.h */ /* DMXModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DMXModule.h; path = ../../Source/Module/modules/dmx/DMXModule.h; sourceTree = SOURCE_ROOT; }; - B6DACF38E3774C2D798157C4 /* include_juce_graphics_Sheenbidi.c */ /* include_juce_graphics_Sheenbidi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = include_juce_graphics_Sheenbidi.c; path = ../../JuceLibraryCode/include_juce_graphics_Sheenbidi.c; sourceTree = SOURCE_ROOT; }; B7037B1303B113B3EB738DE2 /* os_mac_interface.m */ /* os_mac_interface.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = os_mac_interface.m; path = ../../Source/Module/modules/controller/wiimote/lib/wiiuse/os_mac/os_mac_interface.m; sourceTree = SOURCE_ROOT; }; B7BBA4821B4CAD95A467E9DE /* Condition.cpp */ /* Condition.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Condition.cpp; path = ../../Source/Common/Processor/Action/Condition/Condition.cpp; sourceTree = SOURCE_ROOT; }; B84FB7144270D3572B5D9239 /* BaseCommandHandlerEditor.h */ /* BaseCommandHandlerEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BaseCommandHandlerEditor.h; path = ../../Source/Common/Command/ui/BaseCommandHandlerEditor.h; sourceTree = SOURCE_ROOT; }; @@ -927,7 +922,6 @@ F85193CCD2CCA1D72CDCA8D7 /* CommandChooserUI.h */ /* CommandChooserUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CommandChooserUI.h; path = ../../Source/Common/Command/ui/CommandChooserUI.h; sourceTree = SOURCE_ROOT; }; F8E7D02E47F748ADED4BD659 /* server.key */ /* server.key */ = {isa = PBXFileReference; lastKnownFileType = file.key; name = server.key; path = ../../Resources/server/server.key; sourceTree = SOURCE_ROOT; }; F99233D6C8A37D46D317C05B /* NumberComparators.h */ /* NumberComparators.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = NumberComparators.h; path = ../../Source/Common/Processor/Action/Condition/conditions/StandardCondition/Comparator/comparators/NumberComparators.h; sourceTree = SOURCE_ROOT; }; - FA0BBA4178B54CE33B70F744 /* include_juce_core_CompilationTime.cpp */ /* include_juce_core_CompilationTime.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_core_CompilationTime.cpp; path = ../../JuceLibraryCode/include_juce_core_CompilationTime.cpp; sourceTree = SOURCE_ROOT; }; FA28A6E3D992D8E5E14F097E /* StreamDeckCommand.cpp */ /* StreamDeckCommand.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StreamDeckCommand.cpp; path = ../../Source/Module/modules/controller/streamdeck/commands/StreamDeckCommand.cpp; sourceTree = SOURCE_ROOT; }; FA4C14B931E890BB595FF1AA /* ChataigneSequence.h */ /* ChataigneSequence.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ChataigneSequence.h; path = ../../Source/TimeMachine/Sequence/ChataigneSequence.h; sourceTree = SOURCE_ROOT; }; FB08FF8FEEDEA3EB452AD6A8 /* config.h */ /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../../Source/Common/LTC/config.h; sourceTree = SOURCE_ROOT; }; @@ -1363,15 +1357,12 @@ DE62E8E7E1EBB5191F56029B, 8802698D52924F5FAB243444, 46F2EDE77746DD3B70BA3157, - FA0BBA4178B54CE33B70F744, C6D2FE7E6817726C8813E755, B0A212BED0377CF2A9B29C3F, 1BB541E7AC82CF6E1A3C781C, 453B3234420A19837BF931C3, F7B87FFA7807F632CD294BA4, A166E3006BBC663DDF05DE54, - 08727B1936C15CAECD0131E0, - B6DACF38E3774C2D798157C4, 767E6C14CD8A82E65606EB02, 378FBC82648FC26CBEC330A9, F4590876F89E291434F6B792, @@ -3669,15 +3660,12 @@ 1E38E7F8E4ECF0F020101DF4, 4D75BBCB531AE4968206FB8D, 24E9DAD33ACCFA87158E4D92, - D14A9A8E117FC61C24270B27, DA910C499A52C803D9A9158E, 22C2EDFBB5E20006B8E3D8AF, 6B7CCF93B1FF252F3B4A4C2F, F51ACA7801B35A1EBA52FE8C, B7D1E9B2DB666FD0C4DA9CA2, 6E48A19DAF47B6778318F790, - 21919F55110B8DBF3FC8D49F, - 216A21D06E923B13A5B3E6B5, B84C47FC81D491DE8352F7A7, F0BB5E30719519EA30B9FD86, 2231890C46C454B84C7D5049, diff --git a/Builds/Raspberry/Makefile b/Builds/Raspberry/Makefile index f79250501..5f3868d96 100644 --- a/Builds/Raspberry/Makefile +++ b/Builds/Raspberry/Makefile @@ -39,13 +39,13 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=armv8-a endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=1.9.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(shell $(PKG_CONFIG) --cflags alsa freetype2 fontconfig gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -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 := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=1.9.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -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 JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -Wno-multichar $(CFLAGS) JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++17 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/raspberry -L../../External/sdl/lib/raspberry -L../../External/joycon/lib/raspberry -L/usr/lib/arm-linux-gnueabihf -L../../Modules/juce_simpleweb/libs/Linux/armv8-a $(shell $(PKG_CONFIG) --libs alsa freetype2 fontconfig gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lpthread -lJoyShockLibrary -latomic $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/raspberry -L../../External/sdl/lib/raspberry -L../../External/joycon/lib/raspberry -L/usr/lib/arm-linux-gnueabihf -L../../Modules/juce_simpleweb/libs/Linux/armv8-a $(shell $(PKG_CONFIG) --libs alsa freetype2 gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lpthread -lJoyShockLibrary -latomic $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(JUCE_OBJDIR) endif @@ -60,13 +60,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=armv8-a endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=1.9.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(shell $(PKG_CONFIG) --cflags alsa freetype2 fontconfig gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -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 := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=1.9.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -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 JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -Wno-multichar $(CFLAGS) JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++17 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/raspberry -L../../External/sdl/lib/raspberry -L../../External/joycon/lib/raspberry -L/usr/lib/arm-linux-gnueabihf -L../../Modules/juce_simpleweb/libs/Linux/armv8-a $(shell $(PKG_CONFIG) --libs alsa freetype2 fontconfig gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lpthread -lJoyShockLibrary -latomic $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/raspberry -L../../External/sdl/lib/raspberry -L../../External/joycon/lib/raspberry -L/usr/lib/arm-linux-gnueabihf -L../../Modules/juce_simpleweb/libs/Linux/armv8-a $(shell $(PKG_CONFIG) --libs alsa freetype2 gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lpthread -lJoyShockLibrary -latomic $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(JUCE_OBJDIR) endif @@ -114,15 +114,12 @@ OBJECTS_APP := \ $(JUCE_OBJDIR)/include_juce_audio_processors_lv2_libs_12bdca08.o \ $(JUCE_OBJDIR)/include_juce_audio_utils_9f9fb2d6.o \ $(JUCE_OBJDIR)/include_juce_core_f26d17db.o \ - $(JUCE_OBJDIR)/include_juce_core_CompilationTime_9257742c.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 \ - $(JUCE_OBJDIR)/include_juce_graphics_Harfbuzz_60c52ba2.o \ - $(JUCE_OBJDIR)/include_juce_graphics_Sheenbidi_c310974d.o \ $(JUCE_OBJDIR)/include_juce_gui_basics_e3f79785.o \ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o \ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o \ @@ -144,7 +141,7 @@ all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(JUCE_OBJDIR)/execinfo.cmd $(RESOURCES) @command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @$(PKG_CONFIG) --print-errors alsa freetype2 fontconfig gl libcurl + @$(PKG_CONFIG) --print-errors alsa freetype2 gl libcurl @echo Linking "Chataigne - App" -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) @@ -361,11 +358,6 @@ $(JUCE_OBJDIR)/include_juce_core_f26d17db.o: ../../JuceLibraryCode/include_juce_ @echo "Compiling include_juce_core.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -$(JUCE_OBJDIR)/include_juce_core_CompilationTime_9257742c.o: ../../JuceLibraryCode/include_juce_core_CompilationTime.cpp - -$(V_AT)mkdir -p $(@D) - @echo "Compiling include_juce_core_CompilationTime.cpp" - $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" - $(JUCE_OBJDIR)/include_juce_cryptography_8cb807a8.o: ../../JuceLibraryCode/include_juce_cryptography.cpp -$(V_AT)mkdir -p $(@D) @echo "Compiling include_juce_cryptography.cpp" @@ -396,16 +388,6 @@ $(JUCE_OBJDIR)/include_juce_graphics_f817e147.o: ../../JuceLibraryCode/include_j @echo "Compiling include_juce_graphics.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -$(JUCE_OBJDIR)/include_juce_graphics_Harfbuzz_60c52ba2.o: ../../JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp - -$(V_AT)mkdir -p $(@D) - @echo "Compiling include_juce_graphics_Harfbuzz.cpp" - $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" - -$(JUCE_OBJDIR)/include_juce_graphics_Sheenbidi_c310974d.o: ../../JuceLibraryCode/include_juce_graphics_Sheenbidi.c - -$(V_AT)mkdir -p $(@D) - @echo "Compiling include_juce_graphics_Sheenbidi.c" - $(V_AT)$(CC) $(JUCE_CFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" - $(JUCE_OBJDIR)/include_juce_gui_basics_e3f79785.o: ../../JuceLibraryCode/include_juce_gui_basics.cpp -$(V_AT)mkdir -p $(@D) @echo "Compiling include_juce_gui_basics.cpp" diff --git a/Builds/Raspberry64/Makefile b/Builds/Raspberry64/Makefile index c545a3d02..3f279150b 100644 --- a/Builds/Raspberry64/Makefile +++ b/Builds/Raspberry64/Makefile @@ -39,13 +39,13 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=1.9.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(shell $(PKG_CONFIG) --cflags alsa freetype2 fontconfig gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -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 := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=1.9.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -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 JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -Wno-multichar $(CFLAGS) JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++17 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/raspberry64 -L../../External/sdl/lib/raspberry64 -L../../External/joycon/lib/raspberry64 -L../../Modules/juce_simpleweb/libs/Linux/${JUCE_ARCH_LABEL} $(shell $(PKG_CONFIG) --libs alsa freetype2 fontconfig gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lpthread -lJoyShockLibrary -latomic $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/raspberry64 -L../../External/sdl/lib/raspberry64 -L../../External/joycon/lib/raspberry64 -L../../Modules/juce_simpleweb/libs/Linux/${JUCE_ARCH_LABEL} $(shell $(PKG_CONFIG) --libs alsa freetype2 gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lpthread -lJoyShockLibrary -latomic $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(JUCE_OBJDIR) endif @@ -60,13 +60,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=1.9.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(shell $(PKG_CONFIG) --cflags alsa freetype2 fontconfig gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -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 := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=1.9.24" "-DJUCE_APP_VERSION_HEX=0x10918" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -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 JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -Wno-multichar $(CFLAGS) JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++17 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/raspberry64 -L../../External/sdl/lib/raspberry64 -L../../External/joycon/lib/raspberry64 -L../../Modules/juce_simpleweb/libs/Linux/${JUCE_ARCH_LABEL} $(shell $(PKG_CONFIG) --libs alsa freetype2 fontconfig gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lpthread -lJoyShockLibrary -latomic $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L../../External/servus/lib/raspberry64 -L../../External/sdl/lib/raspberry64 -L../../External/joycon/lib/raspberry64 -L../../Modules/juce_simpleweb/libs/Linux/${JUCE_ARCH_LABEL} $(shell $(PKG_CONFIG) --libs alsa freetype2 gl libcurl) -fvisibility=hidden -Wl,-rpath,"lib" -Wl,--as-needed -lrt -ldl -lpthread -lssl -lcrypto -lbluetooth -lServus -lcurl -lSDL2 -lusb-1.0 -lhidapi-hidraw -lpthread -lJoyShockLibrary -latomic $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(JUCE_OBJDIR) endif @@ -114,15 +114,12 @@ OBJECTS_APP := \ $(JUCE_OBJDIR)/include_juce_audio_processors_lv2_libs_12bdca08.o \ $(JUCE_OBJDIR)/include_juce_audio_utils_9f9fb2d6.o \ $(JUCE_OBJDIR)/include_juce_core_f26d17db.o \ - $(JUCE_OBJDIR)/include_juce_core_CompilationTime_9257742c.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 \ - $(JUCE_OBJDIR)/include_juce_graphics_Harfbuzz_60c52ba2.o \ - $(JUCE_OBJDIR)/include_juce_graphics_Sheenbidi_c310974d.o \ $(JUCE_OBJDIR)/include_juce_gui_basics_e3f79785.o \ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o \ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o \ @@ -144,7 +141,7 @@ all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(JUCE_OBJDIR)/execinfo.cmd $(RESOURCES) @command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @$(PKG_CONFIG) --print-errors alsa freetype2 fontconfig gl libcurl + @$(PKG_CONFIG) --print-errors alsa freetype2 gl libcurl @echo Linking "Chataigne - App" -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) @@ -361,11 +358,6 @@ $(JUCE_OBJDIR)/include_juce_core_f26d17db.o: ../../JuceLibraryCode/include_juce_ @echo "Compiling include_juce_core.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -$(JUCE_OBJDIR)/include_juce_core_CompilationTime_9257742c.o: ../../JuceLibraryCode/include_juce_core_CompilationTime.cpp - -$(V_AT)mkdir -p $(@D) - @echo "Compiling include_juce_core_CompilationTime.cpp" - $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" - $(JUCE_OBJDIR)/include_juce_cryptography_8cb807a8.o: ../../JuceLibraryCode/include_juce_cryptography.cpp -$(V_AT)mkdir -p $(@D) @echo "Compiling include_juce_cryptography.cpp" @@ -396,16 +388,6 @@ $(JUCE_OBJDIR)/include_juce_graphics_f817e147.o: ../../JuceLibraryCode/include_j @echo "Compiling include_juce_graphics.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -$(JUCE_OBJDIR)/include_juce_graphics_Harfbuzz_60c52ba2.o: ../../JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp - -$(V_AT)mkdir -p $(@D) - @echo "Compiling include_juce_graphics_Harfbuzz.cpp" - $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" - -$(JUCE_OBJDIR)/include_juce_graphics_Sheenbidi_c310974d.o: ../../JuceLibraryCode/include_juce_graphics_Sheenbidi.c - -$(V_AT)mkdir -p $(@D) - @echo "Compiling include_juce_graphics_Sheenbidi.c" - $(V_AT)$(CC) $(JUCE_CFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" - $(JUCE_OBJDIR)/include_juce_gui_basics_e3f79785.o: ../../JuceLibraryCode/include_juce_gui_basics.cpp -$(V_AT)mkdir -p $(@D) @echo "Compiling include_juce_gui_basics.cpp" diff --git a/Builds/VisualStudio2022/Chataigne_App.vcxproj b/Builds/VisualStudio2022/Chataigne_App.vcxproj index 70f3a5d48..7924610d3 100644 --- a/Builds/VisualStudio2022/Chataigne_App.vcxproj +++ b/Builds/VisualStudio2022/Chataigne_App.vcxproj @@ -1133,7 +1133,7 @@ true - + true @@ -1364,15 +1364,6 @@ true - - true - - - true - - - true - true @@ -1478,9 +1469,6 @@ true - - true - true @@ -1778,6 +1766,9 @@ true + + true + true @@ -1847,9 +1838,6 @@ true - - true - true @@ -2057,9 +2045,6 @@ true - - true - true @@ -2946,15 +2931,12 @@ /bigobj %(AdditionalOptions) - - - /bigobj %(AdditionalOptions) @@ -3345,17 +3327,6 @@ - - - - - - - - - - - @@ -3373,7 +3344,6 @@ - @@ -3389,7 +3359,6 @@ - @@ -3548,7 +3517,6 @@ - @@ -3618,6 +3586,7 @@ + @@ -3633,6 +3602,7 @@ + @@ -3710,7 +3680,6 @@ - @@ -3730,8 +3699,6 @@ - - @@ -5043,8 +5010,6 @@ - - diff --git a/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters index 3bea38730..9874f935a 100644 --- a/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters +++ b/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters @@ -641,24 +641,6 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - {03678508-A517-48BB-FB4A-485628C34E08} @@ -812,9 +794,6 @@ {DF95D4BF-E18C-125A-5EBB-8993A06E232C} - - {E0FCBD5F-0B11-D78C-F786-52AB7FEE2383} - {118946F2-AC24-0F09-62D5-753DF87A60CD} @@ -2308,7 +2287,7 @@ JUCE Modules\juce_core\containers - + JUCE Modules\juce_core\containers @@ -2560,15 +2539,6 @@ JUCE Modules\juce_core\text - - JUCE Modules\juce_core\text - - - JUCE Modules\juce_core\text - - - JUCE Modules\juce_core\text - JUCE Modules\juce_core\text @@ -2677,9 +2647,6 @@ JUCE Modules\juce_core - - JUCE Modules\juce_core - JUCE Modules\juce_cryptography\encryption @@ -2980,6 +2947,9 @@ JUCE Modules\juce_gui_basics\misc + + JUCE Modules\juce_gui_basics\misc + JUCE Modules\juce_gui_basics\mouse @@ -3082,9 +3052,6 @@ JUCE Modules\juce_gui_basics\native - - JUCE Modules\juce_gui_basics\native - JUCE Modules\juce_gui_basics\native @@ -3307,9 +3274,6 @@ JUCE Modules\juce_gui_extra\misc - - JUCE Modules\juce_gui_extra\misc - JUCE Modules\juce_gui_extra\native @@ -4267,9 +4231,6 @@ JUCE Library Code - - JUCE Library Code - JUCE Library Code @@ -4288,12 +4249,6 @@ JUCE Library Code - - JUCE Library Code - - - JUCE Library Code - JUCE Library Code @@ -5454,39 +5409,6 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers - - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - JUCE Modules\juce_core\javascript @@ -5538,9 +5460,6 @@ JUCE Modules\juce_core\memory - - JUCE Modules\juce_core\memory - JUCE Modules\juce_core\memory @@ -5586,9 +5505,6 @@ JUCE Modules\juce_core\misc - - JUCE Modules\juce_core\misc - JUCE Modules\juce_core\misc @@ -6063,9 +5979,6 @@ JUCE Modules\juce_gui_basics\detail - - JUCE Modules\juce_gui_basics\detail - JUCE Modules\juce_gui_basics\detail @@ -6273,6 +6186,9 @@ JUCE Modules\juce_gui_basics\misc + + JUCE Modules\juce_gui_basics\misc + JUCE Modules\juce_gui_basics\mouse @@ -6318,6 +6234,9 @@ JUCE Modules\juce_gui_basics\native\accessibility + + JUCE Modules\juce_gui_basics\native\accessibility + JUCE Modules\juce_gui_basics\native\accessibility @@ -6549,9 +6468,6 @@ JUCE Modules\juce_gui_extra\code_editor - - JUCE Modules\juce_gui_extra\detail - JUCE Modules\juce_gui_extra\documents @@ -6609,12 +6525,6 @@ JUCE Modules\juce_gui_extra\misc - - JUCE Modules\juce_gui_extra\misc - - - JUCE Modules\juce_gui_extra\misc - JUCE Modules\juce_gui_extra\native @@ -10544,12 +10454,6 @@ Chataigne\Resources - - JUCE Modules\juce_core\javascript\choc - - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java diff --git a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj index a890a86ae..544c8a14d 100644 --- a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj +++ b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj @@ -1133,7 +1133,7 @@ true - + true @@ -1364,15 +1364,6 @@ true - - true - - - true - - - true - true @@ -1478,9 +1469,6 @@ true - - true - true @@ -1778,6 +1766,9 @@ true + + true + true @@ -1847,9 +1838,6 @@ true - - true - true @@ -2057,9 +2045,6 @@ true - - true - true @@ -2946,15 +2931,12 @@ /bigobj %(AdditionalOptions) - - - /bigobj %(AdditionalOptions) @@ -3345,17 +3327,6 @@ - - - - - - - - - - - @@ -3373,7 +3344,6 @@ - @@ -3389,7 +3359,6 @@ - @@ -3548,7 +3517,6 @@ - @@ -3618,6 +3586,7 @@ + @@ -3633,6 +3602,7 @@ + @@ -3710,7 +3680,6 @@ - @@ -3730,8 +3699,6 @@ - - @@ -5043,8 +5010,6 @@ - - diff --git a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters index 7fe384b09..ae1343428 100644 --- a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters +++ b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters @@ -641,24 +641,6 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - {03678508-A517-48BB-FB4A-485628C34E08} @@ -812,9 +794,6 @@ {DF95D4BF-E18C-125A-5EBB-8993A06E232C} - - {E0FCBD5F-0B11-D78C-F786-52AB7FEE2383} - {118946F2-AC24-0F09-62D5-753DF87A60CD} @@ -2308,7 +2287,7 @@ JUCE Modules\juce_core\containers - + JUCE Modules\juce_core\containers @@ -2560,15 +2539,6 @@ JUCE Modules\juce_core\text - - JUCE Modules\juce_core\text - - - JUCE Modules\juce_core\text - - - JUCE Modules\juce_core\text - JUCE Modules\juce_core\text @@ -2677,9 +2647,6 @@ JUCE Modules\juce_core - - JUCE Modules\juce_core - JUCE Modules\juce_cryptography\encryption @@ -2980,6 +2947,9 @@ JUCE Modules\juce_gui_basics\misc + + JUCE Modules\juce_gui_basics\misc + JUCE Modules\juce_gui_basics\mouse @@ -3082,9 +3052,6 @@ JUCE Modules\juce_gui_basics\native - - JUCE Modules\juce_gui_basics\native - JUCE Modules\juce_gui_basics\native @@ -3307,9 +3274,6 @@ JUCE Modules\juce_gui_extra\misc - - JUCE Modules\juce_gui_extra\misc - JUCE Modules\juce_gui_extra\native @@ -4267,9 +4231,6 @@ JUCE Library Code - - JUCE Library Code - JUCE Library Code @@ -4288,12 +4249,6 @@ JUCE Library Code - - JUCE Library Code - - - JUCE Library Code - JUCE Library Code @@ -5454,39 +5409,6 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers - - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - JUCE Modules\juce_core\javascript @@ -5538,9 +5460,6 @@ JUCE Modules\juce_core\memory - - JUCE Modules\juce_core\memory - JUCE Modules\juce_core\memory @@ -5586,9 +5505,6 @@ JUCE Modules\juce_core\misc - - JUCE Modules\juce_core\misc - JUCE Modules\juce_core\misc @@ -6063,9 +5979,6 @@ JUCE Modules\juce_gui_basics\detail - - JUCE Modules\juce_gui_basics\detail - JUCE Modules\juce_gui_basics\detail @@ -6273,6 +6186,9 @@ JUCE Modules\juce_gui_basics\misc + + JUCE Modules\juce_gui_basics\misc + JUCE Modules\juce_gui_basics\mouse @@ -6318,6 +6234,9 @@ JUCE Modules\juce_gui_basics\native\accessibility + + JUCE Modules\juce_gui_basics\native\accessibility + JUCE Modules\juce_gui_basics\native\accessibility @@ -6549,9 +6468,6 @@ JUCE Modules\juce_gui_extra\code_editor - - JUCE Modules\juce_gui_extra\detail - JUCE Modules\juce_gui_extra\documents @@ -6609,12 +6525,6 @@ JUCE Modules\juce_gui_extra\misc - - JUCE Modules\juce_gui_extra\misc - - - JUCE Modules\juce_gui_extra\misc - JUCE Modules\juce_gui_extra\native @@ -10544,12 +10454,6 @@ Chataigne\Resources - - JUCE Modules\juce_core\javascript\choc - - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java diff --git a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj index eeae45e84..42f9a66bf 100644 --- a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj +++ b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj @@ -1132,7 +1132,7 @@ true - + true @@ -1363,15 +1363,6 @@ true - - true - - - true - - - true - true @@ -1477,9 +1468,6 @@ true - - true - true @@ -1777,6 +1765,9 @@ true + + true + true @@ -1846,9 +1837,6 @@ true - - true - true @@ -2056,9 +2044,6 @@ true - - true - true @@ -2945,15 +2930,12 @@ /bigobj %(AdditionalOptions) - - - /bigobj %(AdditionalOptions) @@ -3344,17 +3326,6 @@ - - - - - - - - - - - @@ -3372,7 +3343,6 @@ - @@ -3388,7 +3358,6 @@ - @@ -3547,7 +3516,6 @@ - @@ -3617,6 +3585,7 @@ + @@ -3632,6 +3601,7 @@ + @@ -3709,7 +3679,6 @@ - @@ -3729,8 +3698,6 @@ - - @@ -5042,8 +5009,6 @@ - - diff --git a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters index 7fe384b09..ae1343428 100644 --- a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters +++ b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters @@ -641,24 +641,6 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - {03678508-A517-48BB-FB4A-485628C34E08} @@ -812,9 +794,6 @@ {DF95D4BF-E18C-125A-5EBB-8993A06E232C} - - {E0FCBD5F-0B11-D78C-F786-52AB7FEE2383} - {118946F2-AC24-0F09-62D5-753DF87A60CD} @@ -2308,7 +2287,7 @@ JUCE Modules\juce_core\containers - + JUCE Modules\juce_core\containers @@ -2560,15 +2539,6 @@ JUCE Modules\juce_core\text - - JUCE Modules\juce_core\text - - - JUCE Modules\juce_core\text - - - JUCE Modules\juce_core\text - JUCE Modules\juce_core\text @@ -2677,9 +2647,6 @@ JUCE Modules\juce_core - - JUCE Modules\juce_core - JUCE Modules\juce_cryptography\encryption @@ -2980,6 +2947,9 @@ JUCE Modules\juce_gui_basics\misc + + JUCE Modules\juce_gui_basics\misc + JUCE Modules\juce_gui_basics\mouse @@ -3082,9 +3052,6 @@ JUCE Modules\juce_gui_basics\native - - JUCE Modules\juce_gui_basics\native - JUCE Modules\juce_gui_basics\native @@ -3307,9 +3274,6 @@ JUCE Modules\juce_gui_extra\misc - - JUCE Modules\juce_gui_extra\misc - JUCE Modules\juce_gui_extra\native @@ -4267,9 +4231,6 @@ JUCE Library Code - - JUCE Library Code - JUCE Library Code @@ -4288,12 +4249,6 @@ JUCE Library Code - - JUCE Library Code - - - JUCE Library Code - JUCE Library Code @@ -5454,39 +5409,6 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers - - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - JUCE Modules\juce_core\javascript @@ -5538,9 +5460,6 @@ JUCE Modules\juce_core\memory - - JUCE Modules\juce_core\memory - JUCE Modules\juce_core\memory @@ -5586,9 +5505,6 @@ JUCE Modules\juce_core\misc - - JUCE Modules\juce_core\misc - JUCE Modules\juce_core\misc @@ -6063,9 +5979,6 @@ JUCE Modules\juce_gui_basics\detail - - JUCE Modules\juce_gui_basics\detail - JUCE Modules\juce_gui_basics\detail @@ -6273,6 +6186,9 @@ JUCE Modules\juce_gui_basics\misc + + JUCE Modules\juce_gui_basics\misc + JUCE Modules\juce_gui_basics\mouse @@ -6318,6 +6234,9 @@ JUCE Modules\juce_gui_basics\native\accessibility + + JUCE Modules\juce_gui_basics\native\accessibility + JUCE Modules\juce_gui_basics\native\accessibility @@ -6549,9 +6468,6 @@ JUCE Modules\juce_gui_extra\code_editor - - JUCE Modules\juce_gui_extra\detail - JUCE Modules\juce_gui_extra\documents @@ -6609,12 +6525,6 @@ JUCE Modules\juce_gui_extra\misc - - JUCE Modules\juce_gui_extra\misc - - - JUCE Modules\juce_gui_extra\misc - JUCE Modules\juce_gui_extra\native @@ -10544,12 +10454,6 @@ Chataigne\Resources - - JUCE Modules\juce_core\javascript\choc - - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java diff --git a/JuceLibraryCode/AppConfig.h b/JuceLibraryCode/AppConfig.h index 6baa23d16..9865f7a42 100644 --- a/JuceLibraryCode/AppConfig.h +++ b/JuceLibraryCode/AppConfig.h @@ -266,10 +266,18 @@ //#define JUCE_USE_COREIMAGE_LOADER 1 #endif +#ifndef JUCE_USE_DIRECTWRITE + //#define JUCE_USE_DIRECTWRITE 1 +#endif + #ifndef JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING //#define JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING 0 #endif +#ifndef JUCE_FLOAT_COLOURS + #define JUCE_FLOAT_COLOURS 1 +#endif + //============================================================================== // juce_gui_basics flags: @@ -308,10 +316,6 @@ //#define JUCE_WEB_BROWSER 1 #endif -#ifndef JUCE_USE_WIN_WEBVIEW2_WITH_STATIC_LINKING - //#define JUCE_USE_WIN_WEBVIEW2_WITH_STATIC_LINKING 0 -#endif - #ifndef JUCE_USE_WIN_WEBVIEW2 #define JUCE_USE_WIN_WEBVIEW2 1 #endif diff --git a/JuceLibraryCode/include_juce_core_CompilationTime.cpp b/JuceLibraryCode/include_juce_core_CompilationTime.cpp deleted file mode 100644 index 2c58360f9..000000000 --- a/JuceLibraryCode/include_juce_core_CompilationTime.cpp +++ /dev/null @@ -1,9 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include "AppConfig.h" -#include diff --git a/JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp b/JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp deleted file mode 100644 index 593e71a17..000000000 --- a/JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp +++ /dev/null @@ -1,9 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include "AppConfig.h" -#include diff --git a/JuceLibraryCode/include_juce_graphics_Sheenbidi.c b/JuceLibraryCode/include_juce_graphics_Sheenbidi.c deleted file mode 100644 index 4a96a53df..000000000 --- a/JuceLibraryCode/include_juce_graphics_Sheenbidi.c +++ /dev/null @@ -1,9 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include "AppConfig.h" -#include