From: Bergmann89 <info@bergmann89.de>
Date: Tue, 23 Dec 2014 22:22:06 +0000 (+0100)
Subject: * moved configuration to seperate inc file
X-Git-Tag: v3.1.2~3
X-Git-Url: https://git.delphigl.com/?a=commitdiff_plain;h=fb955156e23a85973e7ee2f89954d90574982fef;p=glBitmap.git

* moved configuration to seperate inc file
---

diff --git a/glBitmap.pas b/glBitmap.pas
index c18c83b..0285b0f 100644
--- a/glBitmap.pas
+++ b/glBitmap.pas
@@ -24,73 +24,8 @@
 
 unit glBitmap;
 
-// Please uncomment the defines below to configure the glBitmap to your preferences.
-// If you have configured the unit you can uncomment the warning above.
-{.$MESSAGE error 'Hey. I''m the glBitmap.pas and i need to be configured. My master tell me your preferences! ;)'}
+{$I glBitmapConf.inc}
 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Preferences ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// enable support for OpenGL ES 1.1
-{.$DEFINE OPENGL_ES_1_1}
-
-// enable support for OpenGL ES 2.0
-{.$DEFINE OPENGL_ES_2_0}
-
-// enable support for OpenGL ES 3.0
-{.$DEFINE OPENGL_ES_3_0}
-
-// enable support for all OpenGL ES extensions
-{.$DEFINE OPENGL_ES_EXT}
-
-
-
-// activate to enable the support for SDL_surfaces
-{.$DEFINE GLB_SDL}
-
-// activate  to enable the support for Delphi (including support for Delphi's (not Lazarus') TBitmap)
-{.$DEFINE GLB_DELPHI}
-
-// activate to enable the support for TLazIntfImage from Lazarus
-{.$DEFINE GLB_LAZARUS}
-
-
-
-// activate to enable the support of SDL_image to load files. (READ ONLY)
-// If you enable SDL_image all other libraries will be ignored!
-{.$DEFINE GLB_SDL_IMAGE}
-
-
-
-// activate to enable Lazarus TPortableNetworkGraphic support
-// if you enable this pngImage and libPNG will be ignored
-{.$DEFINE GLB_LAZ_PNG}
-
-// activate to enable png support with the unit pngimage -> http://pngdelphi.sourceforge.net/
-// if you enable pngimage the libPNG will be ignored
-{.$DEFINE GLB_PNGIMAGE}
-
-// activate to use the libPNG -> http://www.libpng.org/
-// You will need an aditional header -> http://www.opengl24.de/index.php?cat=header&file=libpng
-{.$DEFINE GLB_LIB_PNG}
-
-
-
-// activate to enable Lazarus TJPEGImage support
-// if you enable this delphi jpegs and libJPEG will be ignored
-{.$DEFINE GLB_LAZ_JPEG}
-
-// if you enable delphi jpegs the libJPEG will be ignored
-{.$DEFINE GLB_DELPHI_JPEG}
-
-// activate to use the libJPEG -> http://www.ijg.org/
-// You will need an aditional header -> http://www.opengl24.de/index.php?cat=header&file=libjpeg
-{.$DEFINE GLB_LIB_JPEG}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// PRIVATE: do not change anything! //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Delphi Versions
 {$IFDEF fpc}
   {$MODE Delphi}
diff --git a/glBitmapConf.default.inc b/glBitmapConf.default.inc
new file mode 100644
index 0000000..6a9c66c
--- /dev/null
+++ b/glBitmapConf.default.inc
@@ -0,0 +1,61 @@
+{ this is the default configuration file of the glBitmap.pas
+  please uncomment you preferences below, rename this file to glBitmapConf.inc
+  and make it available to your compilers include paths }
+
+
+// enable support for OpenGL ES 1.1
+{.$DEFINE OPENGL_ES_1_1}
+
+// enable support for OpenGL ES 2.0
+{.$DEFINE OPENGL_ES_2_0}
+
+// enable support for OpenGL ES 3.0
+{.$DEFINE OPENGL_ES_3_0}
+
+// enable support for all OpenGL ES extensions
+{.$DEFINE OPENGL_ES_EXT}
+
+
+
+// activate to enable the support for SDL_surfaces
+{.$DEFINE GLB_SDL}
+
+// activate  to enable the support for Delphi (including support for Delphi's (not Lazarus') TBitmap)
+{.$DEFINE GLB_DELPHI}
+
+// activate to enable the support for TLazIntfImage from Lazarus
+{.$DEFINE GLB_LAZARUS}
+
+
+
+// activate to enable the support of SDL_image to load files. (READ ONLY)
+// If you enable SDL_image all other libraries will be ignored!
+{.$DEFINE GLB_SDL_IMAGE}
+
+
+
+// activate to enable Lazarus TPortableNetworkGraphic support
+// if you enable this pngImage and libPNG will be ignored
+{.$DEFINE GLB_LAZ_PNG}
+
+// activate to enable png support with the unit pngimage -> http://pngdelphi.sourceforge.net/
+// if you enable pngimage the libPNG will be ignored
+{.$DEFINE GLB_PNGIMAGE}
+
+// activate to use the libPNG -> http://www.libpng.org/
+// You will need an aditional header -> http://www.opengl24.de/index.php?cat=header&file=libpng
+{.$DEFINE GLB_LIB_PNG}
+
+
+
+// activate to enable Lazarus TJPEGImage support
+// if you enable this delphi jpegs and libJPEG will be ignored
+{.$DEFINE GLB_LAZ_JPEG}
+
+// if you enable delphi jpegs the libJPEG will be ignored
+{.$DEFINE GLB_DELPHI_JPEG}
+
+// activate to use the libJPEG -> http://www.ijg.org/
+// You will need an aditional header -> http://www.opengl24.de/index.php?cat=header&file=libjpeg
+{.$DEFINE GLB_LIB_JPEG}
+             
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 0d5f495..457a008 100644
--- a/readme.txt
+++ b/readme.txt
@@ -22,6 +22,8 @@ functionality of this classes:
 - upload texture data to video card
 - download texture data from video card
 - manipulate texture data (e.g. add alpha, remove alpha, convert to other format, switch RGB, ...)
+
+check glBitmapConf.default.inc to configure the glBitmap.pas to fit your needs
 ------------------------------------------------------------
 History
 20-11-2013