brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Start makefile tweaks to allow wasm builds

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-11-09 12:59:54 +00:00
parent 13727bbf8c
commit bac019897f
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
5 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -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

2
deps/Makefile vendored
View file

@ -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

4
plugins/Makefile
View file

@ -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

4
src/Makefile
View file

@ -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

4
src/Makefile.cardinal.mk
View file

@ -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