Signed-off-by: falkTX <falktx@falktx.com>tags/22.02
@@ -51,6 +51,7 @@ endif | |||||
ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true) | ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true) | ||||
ifneq ($(HEADLESS),true) | ifneq ($(HEADLESS),true) | ||||
ifneq ($(WASM),true) | |||||
ifneq ($(HAVE_OPENGL),true) | ifneq ($(HAVE_OPENGL),true) | ||||
$(error X11 dependency not installed/available) | $(error X11 dependency not installed/available) | ||||
@@ -72,6 +73,7 @@ CARLA_EXTRA_ARGS += HAVE_X11=false | |||||
CARLA_EXTRA_ARGS += HAVE_XEXT=false | CARLA_EXTRA_ARGS += HAVE_XEXT=false | ||||
CARLA_EXTRA_ARGS += HAVE_XRANDR=false | CARLA_EXTRA_ARGS += HAVE_XRANDR=false | ||||
endif | |||||
endif | endif | ||||
endif | endif | ||||
@@ -47,6 +47,8 @@ MACHINE = x86_64-the-rack | |||||
else ifeq ($(CPU_ARM),true) | else ifeq ($(CPU_ARM),true) | ||||
ARCH_NAME = arm | ARCH_NAME = arm | ||||
MACHINE = i686-the-rack | MACHINE = i686-the-rack | ||||
else ifeq ($(WASM),true) | |||||
MACHINE = i686-wasm | |||||
else | else | ||||
MACHINE = $(TARGET_MACHINE) | MACHINE = $(TARGET_MACHINE) | ||||
endif | endif | ||||
@@ -546,6 +546,10 @@ BASE_FLAGS += -DZSTDLIB_VISIBILITY= | |||||
BASE_FLAGS += -I../src/Rack/dep/include | BASE_FLAGS += -I../src/Rack/dep/include | ||||
endif | endif | ||||
ifeq ($(WASM),true) | |||||
BASE_FLAGS += -DNANOVG_GLES2=1 | |||||
endif | |||||
ifeq ($(WINDOWS),true) | ifeq ($(WINDOWS),true) | ||||
BASE_FLAGS += -D_USE_MATH_DEFINES | BASE_FLAGS += -D_USE_MATH_DEFINES | ||||
BASE_FLAGS += -DWIN32_LEAN_AND_MEAN | BASE_FLAGS += -DWIN32_LEAN_AND_MEAN | ||||
@@ -51,6 +51,10 @@ BASE_FLAGS += -IRack/dep/oui-blendish | |||||
BASE_FLAGS += -IRack/dep/pffft | BASE_FLAGS += -IRack/dep/pffft | ||||
BASE_FLAGS += -pthread | BASE_FLAGS += -pthread | ||||
ifeq ($(WASM),true) | |||||
BASE_FLAGS += -DNANOVG_GLES2=1 | |||||
endif | |||||
ifeq ($(WINDOWS),true) | ifeq ($(WINDOWS),true) | ||||
BASE_FLAGS += -D_USE_MATH_DEFINES | BASE_FLAGS += -D_USE_MATH_DEFINES | ||||
BASE_FLAGS += -DWIN32_LEAN_AND_MEAN | BASE_FLAGS += -DWIN32_LEAN_AND_MEAN | ||||
@@ -144,6 +144,10 @@ BASE_FLAGS += -I../Rack/dep/nanosvg/src | |||||
BASE_FLAGS += -I../Rack/dep/oui-blendish | BASE_FLAGS += -I../Rack/dep/oui-blendish | ||||
BASE_FLAGS += -pthread | BASE_FLAGS += -pthread | ||||
ifeq ($(WASM),true) | |||||
BASE_FLAGS += -DNANOVG_GLES2=1 | |||||
endif | |||||
ifeq ($(WINDOWS),true) | ifeq ($(WINDOWS),true) | ||||
BASE_FLAGS += -D_USE_MATH_DEFINES | BASE_FLAGS += -D_USE_MATH_DEFINES | ||||
BASE_FLAGS += -DWIN32_LEAN_AND_MEAN | BASE_FLAGS += -DWIN32_LEAN_AND_MEAN | ||||