Browse Source

Fixed GCC build.

Lasse Öörni 14 years ago
parent
commit
cee327dfb2
2 changed files with 14 additions and 15 deletions
  1. 1 1
      Engine/Resource/XMLFile.cpp
  2. 13 14
      Tools/GLShaderProcessor/GLShaderProcessor.cpp

+ 1 - 1
Engine/Resource/XMLFile.cpp

@@ -46,7 +46,7 @@ public:
     }
     }
     
     
     /// Write bytes to output.
     /// Write bytes to output.
-    void XMLWriter::write(const void* data, size_t size)
+    void write(const void* data, size_t size)
     {
     {
         if (dest_.Write(data, size) != size)
         if (dest_.Write(data, size) != size)
             success_ = false;
             success_ = false;

+ 13 - 14
Tools/GLShaderProcessor/GLShaderProcessor.cpp

@@ -199,9 +199,9 @@ void Run(const Vector<String>& arguments)
     XMLElement shader = shaders.GetChild("shader");
     XMLElement shader = shaders.GetChild("shader");
     while (shader)
     while (shader)
     {
     {
-        String source = shader.GetString("name");
+        String source = shader.GetAttribute("name");
         ShaderType compileType = Both;
         ShaderType compileType = Both;
-        String type = shader.GetString("type");
+        String type = shader.GetAttribute("type");
         if (type == "VS" || type == "vs")
         if (type == "VS" || type == "vs")
             compileType = VS;
             compileType = VS;
         if (type == "PS" || type == "ps")
         if (type == "PS" || type == "ps")
@@ -215,51 +215,51 @@ void Run(const Vector<String>& arguments)
             String value = variation.GetName();
             String value = variation.GetName();
             if (value == "variation" || value == "option")
             if (value == "variation" || value == "option")
             {
             {
-                String name = variation.GetString("name");
+                String name = variation.GetAttribute("name");
                 
                 
                 Variation newVar(name, value == "option");
                 Variation newVar(name, value == "option");
                 
                 
-                String simpleDefine = variation.GetString("define");
+                String simpleDefine = variation.GetAttribute("define");
                 if (!simpleDefine.Empty())
                 if (!simpleDefine.Empty())
                     newVar.defines_.Push(simpleDefine);
                     newVar.defines_.Push(simpleDefine);
                     
                     
-                String simpleExclude = variation.GetString("exclude");
+                String simpleExclude = variation.GetAttribute("exclude");
                 if (!simpleExclude.Empty())
                 if (!simpleExclude.Empty())
                     newVar.excludes_.Push(simpleExclude);
                     newVar.excludes_.Push(simpleExclude);
                 
                 
-                String simpleInclude = variation.GetString("include");
+                String simpleInclude = variation.GetAttribute("include");
                 if (!simpleInclude.Empty())
                 if (!simpleInclude.Empty())
                     newVar.includes_.Push(simpleInclude);
                     newVar.includes_.Push(simpleInclude);
                 
                 
-                String simpleRequire = variation.GetString("require");
+                String simpleRequire = variation.GetAttribute("require");
                 if (!simpleRequire.Empty())
                 if (!simpleRequire.Empty())
                     newVar.requires_.Push(simpleRequire);
                     newVar.requires_.Push(simpleRequire);
                 
                 
                 XMLElement define = variation.GetChild("define");
                 XMLElement define = variation.GetChild("define");
                 while (define)
                 while (define)
                 {
                 {
-                    newVar.defines_.Push(define.GetString("name"));
+                    newVar.defines_.Push(define.GetAttribute("name"));
                     define = define.GetNext("define");
                     define = define.GetNext("define");
                 }
                 }
                 
                 
                 XMLElement exclude = variation.GetChild("exclude");
                 XMLElement exclude = variation.GetChild("exclude");
                 while (exclude)
                 while (exclude)
                 {
                 {
-                    newVar.excludes_.Push(exclude.GetString("name"));
+                    newVar.excludes_.Push(exclude.GetAttribute("name"));
                     exclude = exclude.GetNext("exclude");
                     exclude = exclude.GetNext("exclude");
                 }
                 }
                 
                 
                 XMLElement include = variation.GetChild("include");
                 XMLElement include = variation.GetChild("include");
                 while (include)
                 while (include)
                 {
                 {
-                    newVar.includes_.Push(include.GetString("name"));
+                    newVar.includes_.Push(include.GetAttribute("name"));
                     include = include.GetNext("include");
                     include = include.GetNext("include");
                 }
                 }
                 
                 
                 XMLElement require = variation.GetChild("require");
                 XMLElement require = variation.GetChild("require");
                 while (require)
                 while (require)
                 {
                 {
-                    newVar.requires_.Push(require.GetString("name"));
+                    newVar.requires_.Push(require.GetAttribute("name"));
                     require = require.GetNext("require");
                     require = require.GetNext("require");
                 }
                 }
                 
                 
@@ -510,7 +510,7 @@ void ProcessVariations(const Shader& baseShader, XMLElement& shaders)
     for (unsigned i = 0; i < processedVariations.Size(); ++i)
     for (unsigned i = 0; i < processedVariations.Size(); ++i)
     {
     {
         XMLElement variationElem = shaderElem.CreateChild("variation");
         XMLElement variationElem = shaderElem.CreateChild("variation");
-        variationElem.SetString("name", processedVariations[i].name_);
+        variationElem.SetAttribute("name", processedVariations[i].name_);
         
         
         String allDefines;
         String allDefines;
         for (unsigned j = 0; j < processedVariations[i].defines_.Size(); ++j)
         for (unsigned j = 0; j < processedVariations[i].defines_.Size(); ++j)
@@ -520,7 +520,7 @@ void ProcessVariations(const Shader& baseShader, XMLElement& shaders)
             allDefines += processedVariations[i].defines_[j];
             allDefines += processedVariations[i].defines_[j];
         }
         }
         
         
-        variationElem.SetString("defines", allDefines);
+        variationElem.SetAttribute("defines", allDefines);
     }
     }
     
     
     outFile.Open(xmlOutFileName, FILE_WRITE);
     outFile.Open(xmlOutFileName, FILE_WRITE);
@@ -529,4 +529,3 @@ void ProcessVariations(const Shader& baseShader, XMLElement& shaders)
     xmlOutFile.Save(outFile);
     xmlOutFile.Save(outFile);
     outFile.Close();
     outFile.Close();
 }
 }
-