ecere: Excluding OpenGL dependency for installer configuration

- No OpenGL / Shader support for ECERE_ONEDRIVER
ecere · Aug 4, 2016 · 3d0fe7a · 3d0fe7a
1 parent 4f84a61
commit 3d0fe7a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/ecere/ecere.epj b/ecere/ecere.epj
@@ -1248,6 +1248,12 @@ if distributed with the Ecere SDK Windows installer.
                                        "Options" : {
                                           "ExcludeFromBuild" : false
                                        }
+                                    },
+                                    {
+                                       "Name" : "Installer",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
                                     }
                                  ]
                               },
@@ -1274,6 +1280,12 @@ if distributed with the Ecere SDK Windows installer.
                                        "Options" : {
                                           "ExcludeFromBuild" : false
                                        }
+                                    },
+                                    {
+                                       "Name" : "Installer",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
                                     }
                                  ]
                               }

diff --git a/ecere/src/gfx/Display.ec b/ecere/src/gfx/Display.ec
@@ -1281,7 +1281,7 @@ public:
    property bool useSharedMemory { set { useSharedMemory = value; } get { return useSharedMemory; } };
    property void * systemWindow { get { return window; } };
    property DisplaySystem displaySystem { get { return displaySystem; } };
-#ifndef ECERE_VANILLA
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
    property GLCapabilities glCapabilities
    {
       get { return ((OGLDisplay)driverData).capabilities; }

diff --git a/ecere/src/gfx/drivers/LFBDisplayDriver.ec b/ecere/src/gfx/drivers/LFBDisplayDriver.ec
@@ -35,7 +35,7 @@ public class Font : struct { }
 import "lfbBlit"
 import "lfbConvert"
 
-#if !defined(ECERE_NO3D) && !defined(ECERE_VANILLA) && defined(__WIN32__)
+#if !defined(ECERE_NO3D) && !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && defined(__WIN32__)
 import "OpenGLDisplayDriver"
 
 #if !defined(_GLES) && !defined(ECERE_STATIC)

diff --git a/ecere/src/gfx/fontRendering.ec b/ecere/src/gfx/fontRendering.ec
@@ -805,18 +805,16 @@ public class Font : struct
 
    ~Font()
    {
+#if !defined(ECERE_NOTRUETYPE)
       int entry;
 
-#if !defined(ECERE_NOTRUETYPE)
       GlyphPack pack;
       while((pack = (GlyphPack)glyphPacks.root))
       {
          glyphPacks.Remove(pack);
          delete pack;
       }
-#endif
 
-#if !defined(ECERE_NOTRUETYPE)
       for(entry = 0; entry<MAX_FONT_LINK_ENTRIES; entry++)
       {
          FontEntry fontEntry = fontEntries[entry];
@@ -854,6 +852,7 @@ public class Font : struct
    bool LoadEntry(FaceInfo info)
    {
       bool result = false;
+#if !defined(ECERE_NOTRUETYPE)
       if(numEntries < MAX_FONT_LINK_ENTRIES)
       {
          FontEntry fontEntry = FontEntry::Load(info);
@@ -889,6 +888,7 @@ public class Font : struct
             result = true;
          }
       }
+#endif
       return result;
    }