| @@ -262,6 +262,7 @@ RES = \ | |||||
| bin/resources/carla_config.py \ | bin/resources/carla_config.py \ | ||||
| bin/resources/carla_database.py \ | bin/resources/carla_database.py \ | ||||
| bin/resources/carla_host.py \ | bin/resources/carla_host.py \ | ||||
| bin/resources/carla_panels.py \ | |||||
| bin/resources/carla_settings.py \ | bin/resources/carla_settings.py \ | ||||
| bin/resources/carla_skin.py \ | bin/resources/carla_skin.py \ | ||||
| bin/resources/carla_shared.py \ | bin/resources/carla_shared.py \ | ||||
| @@ -305,6 +305,7 @@ cd glib-2.42.0 | |||||
| chmod +x configure install-sh | chmod +x configure install-sh | ||||
| env CFLAGS="$CFLAGS -I$PREFIX/include" LDFLAGS="$LDFLAGS -L$PREFIX/lib" PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=$PREFIX | env CFLAGS="$CFLAGS -I$PREFIX/include" LDFLAGS="$LDFLAGS -L$PREFIX/lib" PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=$PREFIX | ||||
| env PATH=/opt/local/bin:$PATH make | env PATH=/opt/local/bin:$PATH make | ||||
| sudo touch /opt/carla64/bin/gtester-report | |||||
| sudo make install | sudo make install | ||||
| touch build-done | touch build-done | ||||
| cd .. | cd .. | ||||
| @@ -286,7 +286,7 @@ FLUIDSYNTH_LIBS = $(shell pkg-config --libs fluidsynth) | |||||
| endif | endif | ||||
| ifeq ($(HAVE_LINUXSAMPLER),true) | ifeq ($(HAVE_LINUXSAMPLER),true) | ||||
| LINUXSAMPLER_FLAGS = $(shell pkg-config --cflags linuxsampler) -Wno-unused-parameter | |||||
| LINUXSAMPLER_FLAGS = $(shell pkg-config --cflags linuxsampler) -DIS_CPP11=1 -Wno-non-virtual-dtor -Wno-shadow -Wno-unused-parameter | |||||
| LINUXSAMPLER_LIBS = $(shell pkg-config --libs linuxsampler) | LINUXSAMPLER_LIBS = $(shell pkg-config --libs linuxsampler) | ||||
| endif | endif | ||||
| @@ -1632,7 +1632,9 @@ public: | |||||
| if (midiEvent.size > 4) | if (midiEvent.size > 4) | ||||
| continue; | continue; | ||||
| #ifdef CARLA_PROPER_CPP11_SUPPORT | |||||
| static_assert(4 <= EngineMidiEvent::kDataSize, "Incorrect data"); | static_assert(4 <= EngineMidiEvent::kDataSize, "Incorrect data"); | ||||
| #endif | |||||
| uint8_t status = uint8_t(MIDI_GET_STATUS_FROM_DATA(midiEvent.data)); | uint8_t status = uint8_t(MIDI_GET_STATUS_FROM_DATA(midiEvent.data)); | ||||
| @@ -72,11 +72,13 @@ TARGETS += ui_vst-x11 | |||||
| endif | endif | ||||
| ifeq ($(MACOS),true) | ifeq ($(MACOS),true) | ||||
| TARGETS += ui_lv2-cocoa | |||||
| # TODO | |||||
| # TARGETS += ui_lv2-cocoa | |||||
| endif | endif | ||||
| ifeq ($(WIN32),true) | ifeq ($(WIN32),true) | ||||
| TARGETS += ui_lv2-windows | |||||
| # TODO | |||||
| # TARGETS += ui_lv2-windows | |||||
| endif | endif | ||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| @@ -14,12 +14,15 @@ ifeq ($(CARLA_VESTIGE_HEADER),true) | |||||
| BUILD_CXX_FLAGS += -DVESTIGE_HEADER | BUILD_CXX_FLAGS += -DVESTIGE_HEADER | ||||
| else | else | ||||
| # needed by vst3 | # needed by vst3 | ||||
| BUILD_CXX_FLAGS += -D_NATIVE_WCHAR_T_DEFINED -D__wchar_t=wchar_t -fpermissive | |||||
| ifeq ($(DEBUG),true) | ifeq ($(DEBUG),true) | ||||
| BUILD_CXX_FLAGS += -DDEVELOPMENT -D_DEBUG | BUILD_CXX_FLAGS += -DDEVELOPMENT -D_DEBUG | ||||
| else | else | ||||
| BUILD_CXX_FLAGS += -DRELEASE | BUILD_CXX_FLAGS += -DRELEASE | ||||
| endif | endif | ||||
| # needed by vst3 on mingw | |||||
| ifeq ($(WIN32),true) | |||||
| BUILD_CXX_FLAGS += -D_NATIVE_WCHAR_T_DEFINED -D__wchar_t=wchar_t -fpermissive | |||||
| endif | |||||
| endif | endif | ||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| @@ -118,7 +118,10 @@ struct ERect { | |||||
| int16_t top, left, bottom, right; | int16_t top, left, bottom, right; | ||||
| }; | }; | ||||
| #else | #else | ||||
| #ifndef CARLA_OS_MAC | |||||
| #ifdef CARLA_OS_MAC | |||||
| # undef __ppc__ | |||||
| # define __ppc__ 0 | |||||
| #else | |||||
| # undef TARGET_API_MAC_CARBON | # undef TARGET_API_MAC_CARBON | ||||
| # define TARGET_API_MAC_CARBON 0 | # define TARGET_API_MAC_CARBON 0 | ||||
| #endif | #endif | ||||