ecere/ecere.epj: Project tweak for WSMS build

- Also excluding newFonts stuff with NO3D

diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index 8a0d2c9..8a988da 100644 (file)
--- a/ecere/ecere.epj
+++ b/ecere/ecere.epj
@@ -371,14 +371,15 @@ if distributed with the Ecere SDK Windows installer.
       {
          "Name" : "WSMS",
          "Options" : {
-            "Optimization" : "Size",
+            "Optimization" : "Speed",
             "PreprocessorDefinitions" : [
                "ECERE_STATIC",
                "ECERE_NO3D",
                "ECERE_NOSSL"
             ],
             "TargetType" : "StaticLibrary",
-            "TargetFileName" : "ecereWSMS"
+            "TargetFileName" : "ecereWSMS",
+            "FastMath" : true
          },
          "Platforms" : [
             {
@@ -1234,6 +1235,12 @@ if distributed with the Ecere SDK Windows installer.
                                        "Options" : {
                                           "ExcludeFromBuild" : true
                                        }
+                                    },
+                                    {
+                                       "Name" : "WSMS",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
                                     }
                                  ]
                               },
@@ -1266,6 +1273,12 @@ if distributed with the Ecere SDK Windows installer.
                                        "Options" : {
                                           "ExcludeFromBuild" : true
                                        }
+                                    },
+                                    {
+                                       "Name" : "WSMS",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
                                     }
                                  ]
                               }
@@ -2177,7 +2190,15 @@ if distributed with the Ecere SDK Windows installer.
                         "IncludeDirs" : [
                            "src/gfx/newFonts/cc"
                         ]
-                     }
+                     },
+                     "Configurations" : [
+                        {
+                           "Name" : "WSMS",
+                           "Options" : {
+                              "ExcludeFromBuild" : true
+                           }
+                        }
+                     ]
                   },
                   "Bitmap.ec",
                   "BitmapResource.ec",
@@ -2188,7 +2209,17 @@ if distributed with the Ecere SDK Windows installer.
                   "Resource.ec",
                   "Surface.ec",
                   "fontManagement.ec",
-                  "fontRendering.ec",
+                  {
+                     "FileName" : "fontRendering.ec",
+                     "Configurations" : [
+                        {
+                           "Name" : "WSMS",
+                           "Options" : {
+                              "ExcludeFromBuild" : true
+                           }
+                        }
+                     ]
+                  },
                   {
                      "FileName" : "imgDistMap.ec",
                      "Options" : {

diff --git a/ecere/src/gfx/Display.ec b/ecere/src/gfx/Display.ec
index 9d74303..f3f1a2f 100644 (file)
--- a/ecere/src/gfx/Display.ec
+++ b/ecere/src/gfx/Display.ec
@@ -31,7 +31,7 @@ import "Quaternion"
 import "Vector3D"
 #endif
 
-#if (!defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER))
+#if (!defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D))
 import "OpenGLDisplayDriver"
 
 #define near _near
@@ -1282,7 +1282,7 @@ public:
    property bool useSharedMemory { set { useSharedMemory = value; } get { return useSharedMemory; } };
    property void * systemWindow { get { return window; } };
    property DisplaySystem displaySystem { get { return displaySystem; } };
-#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D)
    property GLCapabilities glCapabilities
    {
       get { return ((OGLDisplay)driverData).capabilities; }

diff --git a/ecere/src/gfx/DisplaySystem.ec b/ecere/src/gfx/DisplaySystem.ec
index 93482a4..b5bcab1 100644 (file)
--- a/ecere/src/gfx/DisplaySystem.ec
+++ b/ecere/src/gfx/DisplaySystem.ec
@@ -162,7 +162,7 @@ public:
          resources.Add(res);
 
          // This will load e.g. the Bitmap *
-#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D)
          if(fm)
          {
             ((FontResource)res.resource).LoadFM((FontResource)resource, this, fm);
@@ -171,7 +171,7 @@ public:
 #endif
             res.resource.Load(resource, this);
       }
-#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D)
       else if(fm)
       {
          FontResource fr = (FontResource)res.resource;
@@ -200,7 +200,7 @@ public:
       return _LoadResource(resource, null);
    }
 
-#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D)
    void * LoadResourceFM(Resource resource, FontManager fm)
    {
       return _LoadResource(resource, fm);

diff --git a/ecere/src/gfx/FontResource.ec b/ecere/src/gfx/FontResource.ec
index d85aa87..2231989 100644 (file)
--- a/ecere/src/gfx/FontResource.ec
+++ b/ecere/src/gfx/FontResource.ec
@@ -1,7 +1,7 @@
 namespace gfx;
 
 import "Window"
-#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D)
 import "fmFontManager"
 #endif
 
@@ -17,7 +17,7 @@ public:
    property Window window { set { if(value) { value.RemoveResource(this); value.AddResource(this); } }  };
    property float outlineSize { set { outlineSize = value; } get { return this ? outlineSize : 0; } };
    property float outlineFade { set { outlineFade = value; } get { return this ? outlineFade : 0; } };
-#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D)
    property FMFont fmFont { get { return this ? fmFont : null; } };
 #endif
 
@@ -28,7 +28,7 @@ private:
    FontFlags flags;
    DisplaySystem displaySystem;
    float outlineSize, outlineFade;
-#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D)
    FontManager fm;
    FMFont fmFont;
 #endif
@@ -48,7 +48,7 @@ private:
       }
    }
 
-#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D)
    void LoadFM(FontResource copy, DisplaySystem displaySystem, FontManager fm)
    {
       Load(copy, displaySystem);
@@ -69,7 +69,7 @@ private:
       *&outlineSize = *&reference.outlineSize;
       *&outlineFade = *&reference.outlineFade;
       font = reference.font;
-#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D)
       fmFont = reference.fmFont;
 #endif
    }
@@ -77,7 +77,7 @@ private:
    void Dereference()
    {
       font = null;
-#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D)
       fmFont = null;
 #endif
    }
@@ -86,7 +86,7 @@ private:
    {
       if(font && displaySystem)
          displaySystem.UnloadFont(font);
-#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER)
+#if !defined(ECERE_VANILLA) && !defined(ECERE_ONEDRIVER) && !defined(ECERE_NO3D)
       if(fmFont && fm)
          fm.removeFont(fmFont);
 #endif

diff --git a/ecere/src/gfx/fontRendering.ec b/ecere/src/gfx/fontRendering.ec
index 3d1c79c..2afbed6 100644 (file)
--- a/ecere/src/gfx/fontRendering.ec
+++ b/ecere/src/gfx/fontRendering.ec
@@ -2,7 +2,7 @@ namespace gfx;
 
 import "fontManagement"
 
-#if (defined(ECERE_VANILLA) || defined(ECERE_ONEDRIVER)) && defined(__WIN32__)
+#if (defined(ECERE_VANILLA) || defined(ECERE_ONEDRIVER) || defined(ECERE_NO3D)) && defined(__WIN32__)
 #define ECERE_NOTRUETYPE
 #endif