@@ -272,7 +272,10 @@ BASE_OPTS = -O2 -ffast-math -fdata-sections -ffunction-sections
272
272
endif
273
273
274
274
ifeq ($(DEBUG ) ,true)
275
- BASE_FLAGS += -DDEBUG -O0 -g -fsanitize=address
275
+ BASE_FLAGS += -DDEBUG -O0 -g
276
+ ifneq ($(HAIKU ) ,true)
277
+ BASE_FLAGS += -fsanitize=address
278
+ endif
276
279
LINK_OPTS =
277
280
ifeq ($(WASM ) ,true)
278
281
LINK_OPTS += -sASSERTIONS=1
@@ -347,9 +350,11 @@ endif
347
350
# ---------------------------------------------------------------------------------------------------------------------
348
351
# Check for required libraries
349
352
350
- HAVE_CAIRO = $(shell $(PKG_CONFIG ) --exists cairo && echo true)
353
+ ifneq ($(HAIKU ) ,true)
354
+ HAVE_CAIRO = $(shell $(PKG_CONFIG ) --exists cairo && echo true)
355
+ endif
351
356
352
- ifeq ($(MACOS_OR_WASM_OR_WINDOWS ) ,true)
357
+ ifeq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS ) ,true)
353
358
HAVE_OPENGL = true
354
359
else
355
360
HAVE_OPENGL = $(shell $(PKG_CONFIG ) --exists gl && echo true)
@@ -454,8 +459,8 @@ ifeq ($(HAVE_OPENGL),true)
454
459
DGL_FLAGS += -DHAVE_OPENGL
455
460
456
461
ifeq ($(HAIKU ) ,true)
457
- OPENGL_FLAGS = $( shell $( PKG_CONFIG ) --cflags gl)
458
- OPENGL_LIBS = $( shell $( PKG_CONFIG ) --libs gl)
462
+ OPENGL_FLAGS =
463
+ OPENGL_LIBS = -lGL
459
464
else ifeq ($(MACOS),true)
460
465
OPENGL_FLAGS = -DGL_SILENCE_DEPRECATION=1 -Wno-deprecated-declarations
461
466
OPENGL_LIBS = -framework OpenGL
@@ -481,7 +486,7 @@ endif
481
486
# ---------------------------------------------------------------------------------------------------------------------
482
487
# Set Stub specific stuff
483
488
484
- ifeq ($(MACOS_OR_WASM_OR_WINDOWS ) ,true)
489
+ ifeq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS ) ,true)
485
490
HAVE_STUB = true
486
491
else
487
492
HAVE_STUB = $(HAVE_X11 )
@@ -540,7 +545,7 @@ endif
540
545
# ---------------------------------------------------------------------------------------------------------------------
541
546
# Backwards-compatible HAVE_DGL
542
547
543
- ifeq ($(MACOS_OR_WASM_OR_WINDOWS ) ,true)
548
+ ifeq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS ) ,true)
544
549
HAVE_DGL = true
545
550
else ifeq ($(HAVE_OPENGL),true)
546
551
HAVE_DGL = $(HAVE_X11 )
0 commit comments