samples: Various fixes

- Updated to use new default shader file names
- crosswords: Fixed memory leak

diff --git a/samples/games/chess/chess.epj b/samples/games/chess/chess.epj
index f69f2f1..50304a6 100644 (file)
--- a/samples/games/chess/chess.epj
+++ b/samples/games/chess/chess.epj
@@ -306,8 +306,8 @@
             {
                "Folder" : "shaders",
                "Files" : [
-                  "../../../ecere/src/gfx/drivers/gl3/fixed.frag",
-                  "../../../ecere/src/gfx/drivers/gl3/fixed.vertex"
+                  "../../../ecere/src/gfx/drivers/gl3/default.frag",
+                  "../../../ecere/src/gfx/drivers/gl3/default.vert"
                ]
             },
             "C:/Windows/Fonts/tahoma.ttf",

diff --git a/samples/games/crosswords/CrossWordsServer.ec b/samples/games/crosswords/CrossWordsServer.ec
index 253f611..82bea05 100644 (file)
--- a/samples/games/crosswords/CrossWordsServer.ec
+++ b/samples/games/crosswords/CrossWordsServer.ec
@@ -232,7 +232,7 @@ class CrossWordsGame
             if(word[0])
             {
                String s = CopyString(word);
-               if(!dictionary.Add(CopyString(word)))
+               if(!dictionary.Add(s))
                   delete s;
             }
          }

diff --git a/samples/guiAndGfx/HelloForm/helloForm.epj b/samples/guiAndGfx/HelloForm/helloForm.epj
index 744b797..6eedd88 100644 (file)
--- a/samples/guiAndGfx/HelloForm/helloForm.epj
+++ b/samples/guiAndGfx/HelloForm/helloForm.epj
@@ -43,10 +43,12 @@
             "Libraries" : [
                "ecereStatic",
                "freetype",
-               "z"
+               "z",
+               "jpeg",
+               "png"
             ],
             "LibraryDirs" : [
-               "../../../ecere/obj/emscripten.linux.emscripten.x32"
+               "../../../ecere/obj/emscripten.linux.emscripten"
             ]
          }
       }

diff --git a/samples/guiAndGfx/mandelbrot/mandelbrot.epj b/samples/guiAndGfx/mandelbrot/mandelbrot.epj
index b241dd3..3284be3 100644 (file)
--- a/samples/guiAndGfx/mandelbrot/mandelbrot.epj
+++ b/samples/guiAndGfx/mandelbrot/mandelbrot.epj
@@ -66,8 +66,8 @@
             {
                "Folder" : "shaders",
                "Files" : [
-                  "../../../ecere/src/gfx/drivers/gl3/fixed.frag",
-                  "../../../ecere/src/gfx/drivers/gl3/fixed.vertex"
+                  "../../../ecere/src/gfx/drivers/gl3/default.frag",
+                  "../../../ecere/src/gfx/drivers/gl3/default.vert"
                ]
             }
          ],

diff --git a/samples/guiAndGfx/mekano/mekano.epj b/samples/guiAndGfx/mekano/mekano.epj
index 47662a1..9a2ce01 100644 (file)
--- a/samples/guiAndGfx/mekano/mekano.epj
+++ b/samples/guiAndGfx/mekano/mekano.epj
@@ -122,8 +122,8 @@
             {
                "Folder" : "shaders",
                "Files" : [
-                  "../../../ecere/src/gfx/drivers/gl3/fixed.frag",
-                  "../../../ecere/src/gfx/drivers/gl3/fixed.vertex"
+                  "../../../ecere/src/gfx/drivers/gl3/default.frag",
+                  "../../../ecere/src/gfx/drivers/gl3/default.vert"
                ]
             }
          ]

diff --git a/samples/guiAndGfx/mekano/mekanownd.ec b/samples/guiAndGfx/mekano/mekanownd.ec
index 1d65386..3090033 100644 (file)
--- a/samples/guiAndGfx/mekano/mekanownd.ec
+++ b/samples/guiAndGfx/mekano/mekanownd.ec
@@ -34,7 +34,7 @@ public:
 #endif
    background = slateGray;
 
-   BitmapResource bg { ":ecere.bmp", window = this };
+   // BitmapResource bg { ":ecere.bmp", window = this };
 
    MekanoWnd()
    {