pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

din: include OPSYS check for Darwin in Makefile



Module Name:	pkgsrc-wip
Committed By:	Manuel Kuklinski <mk%asdfghasdfgh.de@localhost>
Pushed By:	mk
Date:		Wed Nov 8 06:30:46 2023 +0000
Changeset:	e117e39ff2cf0b193895b18bbaef76931d0ddfb6

Modified Files:
	din/Makefile
	din/options.mk

Log Message:
din: include OPSYS check for Darwin in Makefile

Don't depend on -lGL on Darwin, otherwise a black screen is produced

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e117e39ff2cf0b193895b18bbaef76931d0ddfb6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 din/Makefile   | 10 +++++++---
 din/options.mk |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs:
diff --git a/din/Makefile b/din/Makefile
index d9eaf72779..f2094e7581 100644
--- a/din/Makefile
+++ b/din/Makefile
@@ -13,9 +13,6 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	autoreconf pkg-config gmake
 GNU_CONFIGURE=	yes
 
-LIBS+=		-ltcl -lSDL -lGL -lpthread
-LIBS.Darwin+=	-lSDLmain -lSDL -Wl,-framework,Cocoa
-
 .include "../../mk/bsd.prefs.mk"
 
 # Work around syntax errors from clang 15.0.0
@@ -23,6 +20,13 @@ LIBS.Darwin+=	-lSDLmain -lSDL -Wl,-framework,Cocoa
 CXXFLAGS+=	-std=c++20
 .endif
 
+# Don't depend on -lGL on Darwin, otherwise a black screen is produced
+.if ${OPSYS} == "Darwin"
+LIBS+=	-ltcl -lSDLmain -lSDL -framework Cocoa -framework OpenGL -lpthread
+.else
+LIBS+=	-ltcl -lSDL -lGL -lpthread
+.endif
+
 .include "options.mk"
 
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/din/options.mk b/din/options.mk
index ff799c8f35..b4bd64c295 100644
--- a/din/options.mk
+++ b/din/options.mk
@@ -30,5 +30,5 @@ LIBS+=		-ljack
 ###
 .if !empty(PKG_OPTIONS:Mcoreaudio)
 CXXFLAGS+=	-D__MACOSX_CORE__
-LIBS+=		-framework OpenGL -framework CoreMIDI -framework CoreAudio -framework CoreFoundation
+LIBS+=		-framework CoreMIDI -framework CoreAudio -framework CoreFoundation
 .endif


Home | Main Index | Thread Index | Old Index