HaikuOS build fixes, headless mode works
This commit is contained in:
parent
bb178bb876
commit
d8d3b83c51
2
carla
2
carla
|
@ -1 +1 @@
|
|||
Subproject commit 1f5e44c4bb4926298e4a9d666436671f2d12e5ff
|
||||
Subproject commit 4b6010bd0adbbed5a0cb89a1253e52e72e648b18
|
|
@ -43,7 +43,7 @@ endif
|
|||
|
||||
ifeq ($(WASM),true)
|
||||
BASE_FLAGS += -msse -msse2 -msse3 -msimd128
|
||||
else
|
||||
else ifneq ($(HAIKU),true)
|
||||
BASE_FLAGS += -pthread
|
||||
endif
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 3afe57a8345814f89cb48df47a9f10f92da3c994
|
||||
Subproject commit f7bada076e2536fbc4ca46b81a34fa27990ffc30
|
|
@ -772,7 +772,7 @@ endif
|
|||
ifeq ($(WASM),true)
|
||||
BASE_FLAGS += -DNANOVG_GLES2=1
|
||||
BASE_FLAGS += -msse -msse2 -msse3 -msimd128
|
||||
else
|
||||
else ifneq ($(HAIKU),true)
|
||||
BASE_FLAGS += -pthread
|
||||
endif
|
||||
|
||||
|
|
|
@ -380,6 +380,9 @@ void CardinalPluginContext::writeMidiMessage(const rack::midi::Message& message,
|
|||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
// invalid
|
||||
return;
|
||||
}
|
||||
|
||||
DISTRHO_SAFE_ASSERT_RETURN(size >= event.size,);
|
||||
|
|
10
src/Makefile
10
src/Makefile
|
@ -32,6 +32,10 @@ else
|
|||
BASE_FLAGS += -DARCH_LIN
|
||||
endif
|
||||
|
||||
ifeq ($(HAIKU),true)
|
||||
BASE_FLAGS += -I../include/haiku-compat
|
||||
endif
|
||||
|
||||
BASE_FLAGS += -fno-strict-aliasing
|
||||
BASE_FLAGS += -DPRIVATE=
|
||||
BASE_FLAGS += -I../dpf/dgl/src/nanovg
|
||||
|
@ -70,12 +74,16 @@ ifeq ($(BSD),true)
|
|||
BASE_FLAGS += -DCLOCK_MONOTONIC_RAW=CLOCK_MONOTONIC_PRECISE
|
||||
endif
|
||||
|
||||
ifeq ($(HAIKU),true)
|
||||
BASE_FLAGS += -DCLOCK_MONOTONIC_RAW=CLOCK_MONOTONIC
|
||||
endif
|
||||
|
||||
ifeq ($(WASM),true)
|
||||
BASE_FLAGS += -DNANOVG_GLES2=1
|
||||
BASE_FLAGS += -msse -msse2 -msse3 -msimd128
|
||||
# FIXME
|
||||
BASE_FLAGS += -DRTLD_DEEPBIND=0
|
||||
else
|
||||
else ifneq ($(HAIKU),true)
|
||||
BASE_FLAGS += -pthread
|
||||
endif
|
||||
|
||||
|
|
|
@ -146,7 +146,6 @@ endif
|
|||
BASE_FLAGS += -I../Rack/dep/glfw/include
|
||||
BASE_FLAGS += -I../Rack/dep/nanosvg/src
|
||||
BASE_FLAGS += -I../Rack/dep/oui-blendish
|
||||
BASE_FLAGS += -pthread
|
||||
|
||||
ifeq ($(HEADLESS),true)
|
||||
BASE_FLAGS += -DHEADLESS
|
||||
|
@ -159,7 +158,7 @@ endif
|
|||
ifeq ($(WASM),true)
|
||||
BASE_FLAGS += -DNANOVG_GLES2=1
|
||||
BASE_FLAGS += -msse -msse2 -msse3 -msimd128
|
||||
else
|
||||
else ifneq ($(HAIKU),true)
|
||||
BASE_FLAGS += -pthread
|
||||
endif
|
||||
|
||||
|
@ -183,7 +182,11 @@ BASE_FLAGS += -Wno-unused-variable
|
|||
# --------------------------------------------------------------
|
||||
# extra linker flags
|
||||
|
||||
ifeq ($(HAIKU),true)
|
||||
LINK_FLAGS += -lpthread
|
||||
else
|
||||
LINK_FLAGS += -pthread
|
||||
endif
|
||||
|
||||
ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
|
||||
ifneq ($(STATIC_BUILD),true)
|
||||
|
|
Loading…
Reference in New Issue