From: rofl0r <retnyg@gmx.net>
Date: Mon, 22 Apr 2013 04:34:46 +0000 (-0400)
Subject: make it possible to build without GL via make DISABLE_GL=1
X-Git-Tag: 0.44.07~16
X-Git-Url: http://ecere.com/cgi-bin/gitweb.cgi?p=sdk;a=commitdiff_plain;h=250e640adfdea584d15dfd632ba010582f38540d

make it possible to build without GL via make DISABLE_GL=1
---

diff --git a/default.cf b/default.cf
index ce69bf4..66f6b0d 100644
--- a/default.cf
+++ b/default.cf
@@ -66,3 +66,8 @@ endif
 CFLAGS += -fmessage-length=0
 
 EARFLAGS = q
+
+ifdef DISABLE_GL
+CFLAGS += -DECERE_NOGL
+endif
+
diff --git a/ecere/Makefile b/ecere/Makefile
index 9b1a0e4..f7880ef 100644
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -102,7 +102,7 @@ _ECSOURCES1 = \
 	src/gfx/drivers/lfbConvert.ec \
 	src/gfx/drivers/LFBDisplayDriver.ec \
 	$(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gfx/drivers/NCursesDisplayDriver.ec,) \
-	src/gfx/drivers/OpenGLDisplayDriver.ec \
+	$(if $(DISABLE_GL),,src/gfx/drivers/OpenGLDisplayDriver.ec) \
 	$(if $(WINDOWS_TARGET),src/gfx/drivers/Win32BitmapPrinterDisplayDriver.ec,)
 _ECSOURCES2 = \
 	$(if $(OSX_TARGET),src/gfx/drivers/CocoaOpenGLDisplayDriver.ec,) \
@@ -470,7 +470,7 @@ LIBS += \
 	$(call _L,X11) \
 	$(call _L,Xext) \
 	$(call _L,Xrender) \
-	$(call _L,GL)
+	$(if $(DISABLE_GL),,$(call _L,GL))
 endif
 
 else
diff --git a/ecere/src/gui/drivers/XInterface.ec b/ecere/src/gui/drivers/XInterface.ec
index 2983be5..3a95d38 100644
--- a/ecere/src/gui/drivers/XInterface.ec
+++ b/ecere/src/gui/drivers/XInterface.ec
@@ -1,7 +1,7 @@
 namespace gui::drivers;
 
 import "instance"
-#if !defined(ECERE_VANILLA) && !defined(ECERE_NO3D)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_NO3D) && !defined(ECERE_NOGL)
 import "OpenGLDisplayDriver"
 #endif
 
@@ -41,7 +41,7 @@ default:
 #include <X11/XKBlib.h>
 #include <X11/keysym.h>
 #include <fcntl.h>
-#if !defined(ECERE_NO3D)
+#if !defined(ECERE_NO3D) && !defined(ECERE_NOGL)
 #include <GL/glx.h>
 #endif
 #include <X11/extensions/Xrender.h>
@@ -1971,7 +1971,7 @@ class XInterface : Interface
       attributes.override_redirect = window.interim ? True : False;
       attributes.event_mask = EVENT_MASK;
       //printf("%s\n", guiApp.defaultDisplayDriver);
-#if !defined(ECERE_VANILLA) && !defined(ECERE_NO3D)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_NO3D) && !defined(ECERE_NOGL)
       if(window.dispDriver == class(OpenGLDisplayDriver) || !strcmp(guiApp.defaultDisplayDriver, "OpenGL"))
       {
          int samples;