[branch-1.3] 1c58799 - Fix fltk-config (OpenGL and macOS)

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[branch-1.3] 1c58799 - Fix fltk-config (OpenGL and macOS) "Albrecht Schlosser" Apr 09, 2021 top right image
 
commit 1c587997c23c7f04b83ea78a8ba2da3fdfc9793f
Author:     Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Fri Apr 9 13:15:33 2021 +0200
Commit:     Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Fri Apr 9 13:17:32 2021 +0200

    Fix fltk-config (OpenGL and macOS)
    
    This file has been missed by the conversion process:
    
    - rename GLLIB to GLLIBS
    - do not "bundle" apps on macOS if built with X11

 fltk-config.in | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git fltk-config.in fltk-config.in
index a85c9a6..18bdac4 100644
--- fltk-config.in
+++ fltk-config.in
@@ -1,10 +1,8 @@
 #!/bin/sh
 #
-# "$Id$"
-#
 # FLTK configuration utility.
 #
-# Copyright 2000-2016 by Bill Spitzak and others.
+# Copyright 2000-2021 by Bill Spitzak and others.
 # Original version Copyright 2000 by James Dean Palmer
 # Adapted by Vincent Penne and Michael Sweet
 #
@@ -12,11 +10,11 @@
 # the file "COPYING" which should have been included with this file.  If this
 # file is missing or damaged, see the license at:
 #
-#      http://www.fltk.org/COPYING.php
+#      https://www.fltk.org/COPYING.php
 #
-# Please report all bugs and problems on the following page:
+# Please see the following page on how to report bugs and issues:
 #
-#      http://www.fltk.org/str.php
+#      https://www.fltk.org/bugs.php
 #
 
 MAJOR_VERSION=@FL_MAJOR_VERSION@
@@ -243,8 +241,8 @@ if test x$use_forms = xyes; then
     LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
 fi
 if test x$use_gl = xyes; then
-    LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
-    LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
+    LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIBS@ $LDLIBS"
+    LDSTATIC="$libdir/libfltk_gl.a @GLLIBS@ $LDSTATIC"
 fi
 if test x$use_images = xyes; then
     LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
@@ -291,7 +289,14 @@ if test -n "$compile"; then
 fi
 
 if test -n "$post"; then
-    case "`uname`" in
+    running=`uname`
+    if test "$running" = "Darwin"; then
+        # if FLTK targets MacOS+X11, apps need not be bundled
+        if test `echo $LDLIBS | fgrep -c -e " -lX11"` = 1; then
+            running=""
+        fi
+    fi
+    case $running in
 	Darwin)
 	    echo Creating "'$post.app'" bundle for desktop...
 	    id=`echo $post | tr ' ' '_'`
@@ -398,7 +403,3 @@ fi
 if test "$echo_includedir" = "yes"; then
     echo $includedir
 fi
-
-#
-# End of "$Id$".
-#
Direct Link to Message ]
 
bottom left image   bottom right image
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2022 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.