wasm and egl/gles related things

Signed-off-by: falkTX <[email protected]>

Makefile.base.mk

@@ -25,55 +25,65 @@ ifneq ($(HAIKU),true)
 ifneq ($(HURD),true)
 ifneq ($(LINUX),true)
 ifneq ($(MACOS),true)
+ifneq ($(WASM),true)
 ifneq ($(WINDOWS),true)
 
 ifneq (,$(findstring bsd,$(TARGET_MACHINE)))
-BSD=true
+BSD = true
 else ifneq (,$(findstring haiku,$(TARGET_MACHINE)))
-HAIKU=true
+HAIKU = true
 else ifneq (,$(findstring linux,$(TARGET_MACHINE)))
-LINUX=true
+LINUX = true
 else ifneq (,$(findstring gnu,$(TARGET_MACHINE)))
-HURD=true
+HURD = true
 else ifneq (,$(findstring apple,$(TARGET_MACHINE)))
-MACOS=true
+MACOS = true
 else ifneq (,$(findstring mingw,$(TARGET_MACHINE)))
-WINDOWS=true
+WINDOWS = true
+else ifneq (,$(findstring msys,$(TARGET_MACHINE)))
+WINDOWS = true
+else ifneq (,$(findstring wasm,$(TARGET_MACHINE)))
+WASM = true
 else ifneq (,$(findstring windows,$(TARGET_MACHINE)))
-WINDOWS=true
+WINDOWS = true
 endif
 
-endif
-endif
-endif
-endif
-endif
-endif
+endif # WINDOWS
+endif # WASM
+endif # MACOS
+endif # LINUX
+endif # HURD
+endif # HAIKU
+endif # BSD
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Auto-detect the processor
 
 TARGET_PROCESSOR := $(firstword $(subst -, ,$(TARGET_MACHINE)))
 
 ifneq (,$(filter i%86,$(TARGET_PROCESSOR)))
-CPU_I386=true
-CPU_I386_OR_X86_64=true
+CPU_I386 = true
+CPU_I386_OR_X86_64 = true
+endif
+ifneq (,$(filter wasm32,$(TARGET_PROCESSOR)))
+CPU_I386 = true
+CPU_I386_OR_X86_64 = true
 endif
 ifneq (,$(filter x86_64,$(TARGET_PROCESSOR)))
-CPU_X86_64=true
-CPU_I386_OR_X86_64=true
+CPU_X86_64 = true
+CPU_I386_OR_X86_64 = true
 endif
 ifneq (,$(filter arm%,$(TARGET_PROCESSOR)))
-CPU_ARM=true
-CPU_ARM_OR_AARCH64=true
+CPU_ARM = true
+CPU_ARM_OR_AARCH64 = true
 endif
 ifneq (,$(filter arm64%,$(TARGET_PROCESSOR)))
-CPU_ARM64=true
-CPU_ARM_OR_AARCH64=true
+CPU_ARM64 = true
+CPU_ARM_OR_AARCH64 = true
 endif
 ifneq (,$(filter aarch64%,$(TARGET_PROCESSOR)))
-CPU_AARCH64=true
-CPU_ARM_OR_AARCH64=true
+CPU_AARCH64 = true
+CPU_ARM_OR_AARCH64 = true
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -90,47 +100,57 @@ endif
 # Set LINUX_OR_MACOS
 
 ifeq ($(LINUX),true)
-LINUX_OR_MACOS=true
+LINUX_OR_MACOS = true
 endif
 
 ifeq ($(MACOS),true)
-LINUX_OR_MACOS=true
+LINUX_OR_MACOS = true
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
-# Set MACOS_OR_WINDOWS and HAIKU_OR_MACOS_OR_WINDOWS
+# Set MACOS_OR_WINDOWS, MACOS_OR_WASM_OR_WINDOWS, HAIKU_OR_MACOS_OR_WINDOWS and HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS
 
 ifeq ($(HAIKU),true)
-HAIKU_OR_MACOS_OR_WINDOWS=true
+HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS = true
+HAIKU_OR_MACOS_OR_WINDOWS = true
 endif
 
 ifeq ($(MACOS),true)
-MACOS_OR_WINDOWS=true
-HAIKU_OR_MACOS_OR_WINDOWS=true
+HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS = true
+HAIKU_OR_MACOS_OR_WINDOWS = true
+MACOS_OR_WASM_OR_WINDOWS = true
+MACOS_OR_WINDOWS = true
+endif
+
+ifeq ($(WASM),true)
+HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS = true
+MACOS_OR_WASM_OR_WINDOWS = true
 endif
 
 ifeq ($(WINDOWS),true)
-MACOS_OR_WINDOWS=true
-HAIKU_OR_MACOS_OR_WINDOWS=true
+HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS = true
+HAIKU_OR_MACOS_OR_WINDOWS = true
+MACOS_OR_WASM_OR_WINDOWS = true
+MACOS_OR_WINDOWS = true
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Set UNIX
 
 ifeq ($(BSD),true)
-UNIX=true
+UNIX = true
 endif
 
 ifeq ($(HURD),true)
-UNIX=true
+UNIX = true
 endif
 
 ifeq ($(LINUX),true)
-UNIX=true
+UNIX = true
 endif
 
 ifeq ($(MACOS),true)
-UNIX=true
+UNIX = true
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -140,7 +160,12 @@ BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
 BASE_OPTS  = -O3 -ffast-math -fdata-sections -ffunction-sections
 
 ifeq ($(CPU_I386_OR_X86_64),true)
-BASE_OPTS += -mtune=generic -msse -msse2 -mfpmath=sse
+BASE_OPTS += -mtune=generic -msse -msse2
+ifeq ($(WASM),true)
+BASE_OPTS += -msse3 -msimd128
+else
+BASE_OPTS += -mfpmath=sse
+endif
 endif
 
 ifeq ($(CPU_ARM),true)
@@ -151,16 +176,19 @@ endif
 
 ifeq ($(MACOS),true)
 # MacOS linker flags
-LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs
+LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-dead_strip,-dead_strip_dylibs
 ifneq ($(SKIP_STRIPPING),true)
 LINK_OPTS += -Wl,-x
 endif
 else
 # Common linker flags
-LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed
+LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-O1,--gc-sections
 ifneq ($(SKIP_STRIPPING),true)
 LINK_OPTS += -Wl,--strip-all
 endif
+ifneq ($(WASM),true)
+LINK_OPTS += -Wl,--as-needed
+endif
 endif
 
 ifeq ($(SKIP_STRIPPING),true)
@@ -172,7 +200,7 @@ ifeq ($(NOOPT),true)
 BASE_OPTS  = -O2 -ffast-math -fdata-sections -ffunction-sections
 endif
 
-ifneq ($(MACOS_OR_WINDOWS),true)
+ifneq ($(MACOS_OR_WASM_OR_WINDOWS),true)
 ifneq ($(BSD),true)
 BASE_FLAGS += -fno-gnu-unique
 endif
@@ -191,6 +219,9 @@ endif
 ifeq ($(DEBUG),true)
 BASE_FLAGS += -DDEBUG -O0 -g
 LINK_OPTS   =
+ifeq ($(WASM),true)
+LINK_OPTS  += -sASSERTIONS=1
+endif
 else
 BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden
 CXXFLAGS   += -fvisibility-inlines-hidden
@@ -210,9 +241,12 @@ BUILD_C_FLAGS   = $(BASE_FLAGS) -std=gnu99 $(CFLAGS)
 BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=gnu++11 $(CXXFLAGS)
 LINK_FLAGS      = $(LINK_OPTS) $(LDFLAGS)
 
-ifneq ($(MACOS),true)
+ifeq ($(WASM),true)
+# Special flag for emscripten
+LINK_FLAGS += -sLLD_REPORT_UNDEFINED
+else ifneq ($(MACOS),true)
 # Not available on MacOS
-LINK_FLAGS     += -Wl,--no-undefined
+LINK_FLAGS += -Wl,--no-undefined
 endif
 
 ifeq ($(MACOS_OLD),true)
@@ -252,7 +286,7 @@ endif
 
 HAVE_CAIRO  = $(shell $(PKG_CONFIG) --exists cairo && echo true)
 
-ifeq ($(MACOS_OR_WINDOWS),true)
+ifeq ($(MACOS_OR_WASM_OR_WINDOWS),true)
 HAVE_OPENGL = true
 else
 HAVE_OPENGL  = $(shell $(PKG_CONFIG) --exists gl && echo true)
@@ -297,18 +331,13 @@ HAVE_JACK = true
 
 ifeq ($(HAIKU),true)
 DGL_SYSTEM_LIBS += -lbe
-endif
-
-ifeq ($(MACOS),true)
+else ifeq ($(MACOS),true)
 DGL_SYSTEM_LIBS += -framework Cocoa -framework CoreVideo
-endif
-
-ifeq ($(WINDOWS),true)
+else ifeq ($(WASM),true)
+else ifeq ($(WINDOWS),true)
 DGL_SYSTEM_LIBS += -lgdi32 -lcomdlg32
 # -lole32
-endif
-
-ifneq ($(MACOS_OR_WINDOWS),true)
+else
 ifeq ($(HAVE_DBUS),true)
 DGL_FLAGS       += $(shell $(PKG_CONFIG) --cflags dbus-1) -DHAVE_DBUS
 DGL_SYSTEM_LIBS += $(shell $(PKG_CONFIG) --libs dbus-1)
@@ -355,18 +384,18 @@ DGL_FLAGS   += -DHAVE_OPENGL
 ifeq ($(HAIKU),true)
 OPENGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl)
 OPENGL_LIBS  = $(shell $(PKG_CONFIG) --libs gl)
-endif
-
-ifeq ($(MACOS),true)
+else ifeq ($(MACOS),true)
 OPENGL_FLAGS = -DGL_SILENCE_DEPRECATION=1 -Wno-deprecated-declarations
 OPENGL_LIBS  = -framework OpenGL
+else ifeq ($(WASM),true)
+ifneq ($(USE_GLES2),true)
+ifneq ($(USE_GLES3),true)
+OPENGL_LIBS  =  -sLEGACY_GL_EMULATION -sGL_UNSAFE_OPTS=0
 endif
-
-ifeq ($(WINDOWS),true)
-OPENGL_LIBS  = -lopengl32
 endif
-
-ifneq ($(MACOS_OR_WINDOWS),true)
+else ifeq ($(WINDOWS),true)
+OPENGL_LIBS  = -lopengl32
+else
 OPENGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl x11)
 OPENGL_LIBS  = $(shell $(PKG_CONFIG) --libs gl x11)
 endif
@@ -378,7 +407,7 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 # Set Stub specific stuff
 
-ifeq ($(MACOS_OR_WINDOWS),true)
+ifeq ($(MACOS_OR_WASM_OR_WINDOWS),true)
 HAVE_STUB = true
 else
 HAVE_STUB = $(HAVE_X11)
@@ -425,7 +454,7 @@ JACK_LIBS  = $(shell $(PKG_CONFIG) --libs jack)
 endif
 endif
 
-ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
+ifneq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS),true)
 SHARED_MEMORY_LIBS = -lrt
 endif
 
@@ -468,6 +497,14 @@ ifneq ($(WINDOWS_ICON_ID),)
 BUILD_CXX_FLAGS += -DDGL_WINDOWS_ICON_ID=$(WINDOWS_ICON_ID)
 endif
 
+ifeq ($(USE_GLES2),true)
+BUILD_CXX_FLAGS += -DDGL_USE_GLES -DDGL_USE_GLES2
+endif
+
+ifeq ($(USE_GLES3),true)
+BUILD_CXX_FLAGS += -DDGL_USE_GLES -DDGL_USE_GLES3
+endif
+
 ifeq ($(USE_OPENGL3),true)
 BUILD_CXX_FLAGS += -DDGL_USE_OPENGL3
 endif
@@ -487,21 +524,21 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 # Set app extension
 
-ifeq ($(WINDOWS),true)
+ifeq ($(WASM),true)
+APP_EXT = .html
+else ifeq ($(WINDOWS),true)
 APP_EXT = .exe
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Set shared lib extension
 
-LIB_EXT = .so
-
 ifeq ($(MACOS),true)
 LIB_EXT = .dylib
-endif
-
-ifeq ($(WINDOWS),true)
+else ifeq ($(WINDOWS),true)
 LIB_EXT = .dll
+else
+LIB_EXT = .so
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -550,9 +587,12 @@ features:
 	$(call print_available,HURD)
 	$(call print_available,LINUX)
 	$(call print_available,MACOS)
+	$(call print_available,WASM)
 	$(call print_available,WINDOWS)
+	$(call print_available,HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS)
 	$(call print_available,HAIKU_OR_MACOS_OR_WINDOWS)
 	$(call print_available,LINUX_OR_MACOS)
+	$(call print_available,MACOS_OR_WASM_OR_WINDOWS)
 	$(call print_available,MACOS_OR_WINDOWS)
 	$(call print_available,UNIX)
 	@echo === Detected features

Makefile.plugins.mk

@@ -51,7 +51,7 @@ BASE_FLAGS += -DHAVE_PULSEAUDIO
 endif
 
 # always needed
-ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
+ifneq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS),true)
 ifneq ($(STATIC_BUILD),true)
 LINK_FLAGS += -ldl
 endif
@@ -162,6 +162,15 @@ SYMBOLS_LV2    = -Wl,-exported_symbols_list,$(DPF_PATH)/utils/symbols/lv2.exp
 SYMBOLS_VST2   = -Wl,-exported_symbols_list,$(DPF_PATH)/utils/symbols/vst2.exp
 SYMBOLS_VST3   = -Wl,-exported_symbols_list,$(DPF_PATH)/utils/symbols/vst3.exp
 SYMBOLS_SHARED = -Wl,-exported_symbols_list,$(DPF_PATH)/utils/symbols/shared.exp
+else ifeq ($(WASM),true)
+SYMBOLS_LADSPA = -sEXPORTED_FUNCTIONS="['ladspa_descriptor']"
+SYMBOLS_DSSI   = -sEXPORTED_FUNCTIONS="['ladspa_descriptor','dssi_descriptor']"
+SYMBOLS_LV2DSP = -sEXPORTED_FUNCTIONS="['lv2_descriptor']"
+SYMBOLS_LV2UI  = -sEXPORTED_FUNCTIONS="['lv2ui_descriptor']"
+SYMBOLS_LV2    = -sEXPORTED_FUNCTIONS="['lv2_descriptor','lv2ui_descriptor']"
+SYMBOLS_VST2   = -sEXPORTED_FUNCTIONS="['VSTPluginMain']"
+SYMBOLS_VST3   = -sEXPORTED_FUNCTIONS="['GetPluginFactory','ModuleEntry','ModuleExit']"
+SYMBOLS_SHARED = -sEXPORTED_FUNCTIONS="['createSharedPlugin']"
 else ifeq ($(WINDOWS),true)
 SYMBOLS_LADSPA = $(DPF_PATH)/utils/symbols/ladspa.def
 SYMBOLS_DSSI   = $(DPF_PATH)/utils/symbols/dssi.def