samples: quick build testing under linux. improved most epj files.

diff --git a/extras/audio/EcereAudio.epj b/extras/audio/EcereAudio.epj
index 0573db1..b96be56 100644 (file)
--- a/extras/audio/EcereAudio.epj
+++ b/extras/audio/EcereAudio.epj
@@ -20,6 +20,17 @@
                "uuid"
             ]
          }
+      },
+      {
+         "Name" : "linux",
+         "Options" : {
+            "Libraries" : [
+               "asound"
+            ],
+            "LinkerOptions" : [
+
+            ]
+         }
       }
    ],
    "Configurations" : [
@@ -54,4 +65,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/extras/fliplay.ec b/extras/fliPlay.ec
similarity index 100%
rename from extras/fliplay.ec
rename to extras/fliPlay.ec

diff --git a/samples/3D/Animate3DS/Animate3DS.epj b/samples/3D/Animate3DS/Animate3DS.epj
index cca0113..33fae6e 100644 (file)
--- a/samples/3D/Animate3DS/Animate3DS.epj
+++ b/samples/3D/Animate3DS/Animate3DS.epj
@@ -24,4 +24,4 @@
       "floor.jpg",
       "wall_80.jpg"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/ColorSpheres/colorSpheres.epj b/samples/3D/ColorSpheres/colorSpheres.epj
index 9072782..ed126aa 100644 (file)
--- a/samples/3D/ColorSpheres/colorSpheres.epj
+++ b/samples/3D/ColorSpheres/colorSpheres.epj
@@ -114,4 +114,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/HiraganaCube/HiraganaCube.epj b/samples/3D/HiraganaCube/HiraganaCube.epj
index c532c05..099e15a 100644 (file)
--- a/samples/3D/HiraganaCube/HiraganaCube.epj
+++ b/samples/3D/HiraganaCube/HiraganaCube.epj
@@ -111,4 +111,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/ModelViewer/eModel.epj b/samples/3D/ModelViewer/eModel.epj
index 032c095..4155e0b 100644 (file)
--- a/samples/3D/ModelViewer/eModel.epj
+++ b/samples/3D/ModelViewer/eModel.epj
@@ -34,4 +34,4 @@
       "ecere.png",
       "help.txt"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/OpenGL/OpenGL.epj b/samples/3D/OpenGL/OpenGL.epj
index dc7ec5b..67fdf50 100644 (file)
--- a/samples/3D/OpenGL/OpenGL.epj
+++ b/samples/3D/OpenGL/OpenGL.epj
@@ -60,4 +60,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/Test3D/Test3D.epj b/samples/3D/Test3D/Test3D.epj
index c4925ff..383ea10 100644 (file)
--- a/samples/3D/Test3D/Test3D.epj
+++ b/samples/3D/Test3D/Test3D.epj
@@ -34,4 +34,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/TransCube/transCube.epj b/samples/3D/TransCube/transCube.epj
index b830ef0..dbeb2e5 100644 (file)
--- a/samples/3D/TransCube/transCube.epj
+++ b/samples/3D/TransCube/transCube.epj
@@ -28,4 +28,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/VertexColorTest/VertexColorTest.epj b/samples/3D/VertexColorTest/VertexColorTest.epj
index 1fb30aa..c513e03 100644 (file)
--- a/samples/3D/VertexColorTest/VertexColorTest.epj
+++ b/samples/3D/VertexColorTest/VertexColorTest.epj
@@ -1,8 +1,6 @@
 {
    "Version" : 0.2,
    "ModuleName" : "VertexColorTest",
-   "Description" : "",
-   "License" : "",
    "Options" : {
       "Warnings" : "All",
       "MemoryGuard" : false,
@@ -36,4 +34,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/cube2/cube2.epj b/samples/3D/cube2/cube2.epj
index b7a0591..fb7ef40 100644 (file)
--- a/samples/3D/cube2/cube2.epj
+++ b/samples/3D/cube2/cube2.epj
@@ -122,4 +122,4 @@
    "Resources" : [
       "knot.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/glTriangle/glTriangle.epj b/samples/3D/glTriangle/glTriangle.epj
index 3395c26..adab9fa 100644 (file)
--- a/samples/3D/glTriangle/glTriangle.epj
+++ b/samples/3D/glTriangle/glTriangle.epj
@@ -53,4 +53,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/hello3D/hello3D.epj b/samples/3D/hello3D/hello3D.epj
index 8adf9ec..3e1ab74 100644 (file)
--- a/samples/3D/hello3D/hello3D.epj
+++ b/samples/3D/hello3D/hello3D.epj
@@ -35,4 +35,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/orbitWithMouse/orbitWithMouse.epj b/samples/3D/orbitWithMouse/orbitWithMouse.epj
index b2f4820..03709ad 100644 (file)
--- a/samples/3D/orbitWithMouse/orbitWithMouse.epj
+++ b/samples/3D/orbitWithMouse/orbitWithMouse.epj
@@ -66,4 +66,4 @@
       "slidehex-tv_guide.png",
       "slidehex-website.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/rayTracedMandelbulb/mandelbulb.epj b/samples/3D/rayTracedMandelbulb/mandelbulb.epj
index 420b621..1f006ff 100644 (file)
--- a/samples/3D/rayTracedMandelbulb/mandelbulb.epj
+++ b/samples/3D/rayTracedMandelbulb/mandelbulb.epj
@@ -13,9 +13,6 @@
       ],
       "Compress" : false
    },
-   "Platforms" : [
-
-   ],
    "Configurations" : [
       {
          "Name" : "Debug",
@@ -40,4 +37,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/spriteBalls/balls.epj b/samples/3D/spriteBalls/balls.epj
index 26faa52..59b078f 100644 (file)
--- a/samples/3D/spriteBalls/balls.epj
+++ b/samples/3D/spriteBalls/balls.epj
@@ -25,4 +25,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/3D/terrainCameraDemo/cameraDemo.epj b/samples/3D/terrainCameraDemo/cameraDemo.epj
index e79a006..fde4e97 100644 (file)
--- a/samples/3D/terrainCameraDemo/cameraDemo.epj
+++ b/samples/3D/terrainCameraDemo/cameraDemo.epj
@@ -1,8 +1,6 @@
 {
    "Version" : 0.2,
    "ModuleName" : "cameraDemo",
-   "Description" : "",
-   "License" : "",
    "Options" : {
       "Warnings" : "All",
       "Debug" : true,
@@ -13,7 +11,6 @@
       ],
       "TargetType" : "Executable",
       "TargetFileName" : "cameraDemo",
-      "TargetDirectory" : "",
       "Libraries" : [
          "ecere"
       ]
@@ -58,4 +55,4 @@
       "../ModelViewer/res/ecere.png",
       "cesna.3ds"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/audio/DirectBufferPlayer/WavPlayer.epj b/samples/audio/DirectBufferPlayer/WavPlayer.epj
index 0bc1f93..8844392 100644 (file)
--- a/samples/audio/DirectBufferPlayer/WavPlayer.epj
+++ b/samples/audio/DirectBufferPlayer/WavPlayer.epj
@@ -56,4 +56,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/audio/Piano/Piano.epj b/samples/audio/Piano/Piano.epj
index daea527..e882c09 100644 (file)
--- a/samples/audio/Piano/Piano.epj
+++ b/samples/audio/Piano/Piano.epj
@@ -36,4 +36,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/audio/PlaySound/PlaySound.epj b/samples/audio/PlaySound/PlaySound.epj
index 2538a43..c33efed 100644 (file)
--- a/samples/audio/PlaySound/PlaySound.epj
+++ b/samples/audio/PlaySound/PlaySound.epj
@@ -1,8 +1,6 @@
 {
    "Version" : 0.2,
    "ModuleName" : "PlaySound",
-   "Description" : "",
-   "License" : "",
    "Options" : {
       "Warnings" : "All",
       "TargetType" : "Executable",
@@ -37,4 +35,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/db/EDATest/EDATest.epj b/samples/db/EDATest/EDATest.epj
index 4af4ff7..c1ea0b4 100644 (file)
--- a/samples/db/EDATest/EDATest.epj
+++ b/samples/db/EDATest/EDATest.epj
@@ -45,4 +45,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/db/MedDB/med.epj b/samples/db/MedDB/med.epj
index e7bc560..f450151 100644 (file)
--- a/samples/db/MedDB/med.epj
+++ b/samples/db/MedDB/med.epj
@@ -48,4 +48,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/db/MovieCollection/MovieCollection.epj b/samples/db/MovieCollection/MovieCollection.epj
index f02a843..a3d41b0 100644 (file)
--- a/samples/db/MovieCollection/MovieCollection.epj
+++ b/samples/db/MovieCollection/MovieCollection.epj
@@ -49,4 +49,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/db/MovieCollection/movieCollection.ec b/samples/db/MovieCollection/movieCollection.ec
index e6786a8..92f7f97 100644 (file)
--- a/samples/db/MovieCollection/movieCollection.ec
+++ b/samples/db/MovieCollection/movieCollection.ec
@@ -53,7 +53,7 @@ class MovieCollectionForm : Window
       list.text = "List of Movies", editor.text = "Movie Entry Being Edited" };
    Button editBorrowers
    {
-      this, text = "Edit Borrowers", altB, stayOnTop = true, anchor = { right = 40, bottom = 40 };
+      this, caption = "Edit Borrowers", altB, stayOnTop = true, anchor = { right = 40, bottom = 40 };
 
       bool NotifyClicked(Button button, int x, int y, Modifiers mods)
       {

diff --git a/samples/eC/FindPrime/PrimeTest.epj b/samples/eC/FindPrime/PrimeTest.epj
index 15ab2a6..58e6fc1 100644 (file)
--- a/samples/eC/FindPrime/PrimeTest.epj
+++ b/samples/eC/FindPrime/PrimeTest.epj
@@ -1,50 +1,39 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "PrimeTest"
-
-   Configurations
-
-    + Debug
-
-         Compiler Options
-
-            Intermediate Directory = debug
-            Debug = True
-            Optimize = None
-            AllWarnings = True
-
-            Preprocessor Definitions = _DEBUG
-
-         Linker Options
-
-            Target Name = PrimeTest
-            Target Type = Executable
-            Target Directory = debug
-            Console = True
-
-            Libraries = ecere
-
-    + Release
-
-         Compiler Options
-
-            Intermediate Directory = release
-            Debug = False
-            Optimize = Speed
-            AllWarnings = True
-
-         Linker Options
-
-            Target Name = PrimeTest
-            Target Type = Executable
-            Target Directory = release
-            Console = True
-
-            Libraries = ecereCOM
-
-   Files
-
-    - findPrime.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "PrimeTest",
+   "Options" : {
+      "Warnings" : "All",
+      "TargetType" : "Executable",
+      "TargetFileName" : "PrimeTest",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : true
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None",
+            "PreprocessorDefinitions" : [
+               "_DEBUG"
+            ]
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "Optimization" : "Speed"
+         }
+      }
+   ],
+   "Files" : [
+      "findPrime.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/eC/HelloWorld/HelloWorld.epj b/samples/eC/HelloWorld/HelloWorld.epj
index 291e0c9..325c5a5 100644 (file)
--- a/samples/eC/HelloWorld/HelloWorld.epj
+++ b/samples/eC/HelloWorld/HelloWorld.epj
@@ -33,4 +33,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/eC/ampheck/ampheck.epj b/samples/eC/ampheck/ampheck.epj
index b8cec8f..c66b506 100644 (file)
--- a/samples/eC/ampheck/ampheck.epj
+++ b/samples/eC/ampheck/ampheck.epj
@@ -4,6 +4,7 @@
    "Options" : {
       "Warnings" : "All",
       "TargetType" : "Executable",
+      "TargetFileName" : "ampheck",
       "Libraries" : [
          "ecere"
       ]
@@ -17,7 +18,6 @@
             "PreprocessorDefinitions" : [
                "_DEBUG"
             ],
-            "TargetFileName" : "ampheck",
             "Console" : true
          }
       },
@@ -25,8 +25,7 @@
          "Name" : "Release",
          "Options" : {
             "Debug" : false,
-            "Optimization" : "Speed",
-            "TargetFileName" : "ampChecks"
+            "Optimization" : "Speed"
          }
       }
    ],
@@ -38,4 +37,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/eC/ecas/ecas.epj b/samples/eC/ecas/ecas.epj
index da2137d..14c47cc 100644 (file)
--- a/samples/eC/ecas/ecas.epj
+++ b/samples/eC/ecas/ecas.epj
@@ -4,6 +4,7 @@
    "Options" : {
       "Warnings" : "All",
       "TargetType" : "Executable",
+      "TargetFileName" : "ecas",
       "Libraries" : [
          "ecere"
       ]
@@ -17,9 +18,6 @@
             "PreprocessorDefinitions" : [
                "_DEBUG"
             ],
-            "TargetFileName" : "ecas",
-            "TargetDirectory" : "debug",
-            "ObjectsDirectory" : "debug",
             "Console" : true
          }
       },
@@ -27,10 +25,7 @@
          "Name" : "Release",
          "Options" : {
             "Debug" : false,
-            "Optimization" : "Speed",
-            "TargetFileName" : "ecas",
-            "TargetDirectory" : "release",
-            "ObjectsDirectory" : "release"
+            "Optimization" : "Speed"
          }
       }
    ],
@@ -43,4 +38,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/eC/fibonacci/fibo.epj b/samples/eC/fibonacci/fibo.epj
index 7dc14a7..ce7f4c1 100644 (file)
--- a/samples/eC/fibonacci/fibo.epj
+++ b/samples/eC/fibonacci/fibo.epj
@@ -1,58 +1,43 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "fibo"
-
-   Configurations
-
-    + Debug
-
-         Compiler Options
-
-            Intermediate Directory = debug
-            Debug = True
-            Optimize = None
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-
-            Preprocessor Definitions = _DEBUG
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = fibo
-            Target Type = Executable
-            Target Directory = debug
-            Console = False
-            Compress = False
-
-            Libraries = ecere
-
-    + Release
-
-         Compiler Options
-
-            Intermediate Directory = release
-            Debug = False
-            Optimize = Speed
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = fibo
-            Target Type = Executable
-            Target Directory = release
-            Console = False
-            Compress = False
-
-            Libraries = ecere
-
-   Files
-
-    - fibo.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "fibo",
+   "Options" : {
+      "Warnings" : "All",
+      "MemoryGuard" : false,
+      "Profile" : false,
+      "StrictNameSpaces" : false,
+      "TargetType" : "Executable",
+      "TargetFileName" : "fibo",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : false,
+      "Compress" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None",
+            "PreprocessorDefinitions" : [
+               "_DEBUG"
+            ]
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "Optimization" : "Speed"
+         }
+      }
+   ],
+   "Files" : [
+      "fibo.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/eC/neural/neural.epj b/samples/eC/neural/neural.epj
index 11c5330..936451f 100644 (file)
--- a/samples/eC/neural/neural.epj
+++ b/samples/eC/neural/neural.epj
@@ -1,59 +1,45 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "neural"
-
-   Configurations
-
-    + Debug
-
-         Compiler Options
-
-            Intermediate Directory = debug
-            Debug = True
-            Optimize = None
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-
-            Preprocessor Definitions = _DEBUG
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = neural
-            Target Type = Executable
-            Target Directory = debug
-            Console = True
-            Compress = False
-
-            Libraries = ecere
-
-    + Release
-
-         Compiler Options
-
-            Intermediate Directory = release
-            Debug = False
-            Optimize = Speed
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = neural
-            Target Type = Executable
-            Target Directory = release
-            Console = False
-            Compress = False
-
-            Libraries = ecere
-
-   Files
-
-    - neural.ec
-    - neurons.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "neural",
+   "Options" : {
+      "Warnings" : "All",
+      "MemoryGuard" : false,
+      "Profile" : false,
+      "StrictNameSpaces" : false,
+      "TargetType" : "Executable",
+      "TargetFileName" : "neural",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Compress" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None",
+            "PreprocessorDefinitions" : [
+               "_DEBUG"
+            ],
+            "Console" : true
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "Optimization" : "Speed",
+            "Console" : false
+         }
+      }
+   ],
+   "Files" : [
+      "neural.ec",
+      "neurons.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/eC/staticLink/staticLink.epj b/samples/eC/staticLink/staticLink.epj
index da744e6..44be8d3 100644 (file)
--- a/samples/eC/staticLink/staticLink.epj
+++ b/samples/eC/staticLink/staticLink.epj
@@ -143,4 +143,4 @@
          ]
       }
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/games/blokus/blokus.epj b/samples/games/blokus/blokus.epj
index c5d47e5..d66e409 100644 (file)
--- a/samples/games/blokus/blokus.epj
+++ b/samples/games/blokus/blokus.epj
@@ -48,4 +48,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/games/bomb/bomb.epj b/samples/games/bomb/bomb.epj
index 4e0ddb2..f59a4d5 100644 (file)
--- a/samples/games/bomb/bomb.epj
+++ b/samples/games/bomb/bomb.epj
@@ -6,6 +6,7 @@
       "Profile" : false,
       "StrictNameSpaces" : false,
       "TargetType" : "Executable",
+      "TargetFileName" : "bomb",
       "Libraries" : [
          "ecere"
       ]
@@ -17,7 +18,6 @@
             "Debug" : true,
             "MemoryGuard" : false,
             "Optimization" : "None",
-            "TargetFileName" : "bomb",
             "Console" : false
          }
       },
@@ -27,7 +27,6 @@
             "Debug" : true,
             "MemoryGuard" : true,
             "Optimization" : "None",
-            "TargetFileName" : "bomb",
             "Console" : true
          }
       },
@@ -37,7 +36,6 @@
             "Debug" : false,
             "MemoryGuard" : false,
             "Optimization" : "Speed",
-            "TargetFileName" : "bomb",
             "Console" : false
          }
       }
@@ -69,4 +67,4 @@
       "res/map8.dat",
       "res/map9.dat"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/games/brainstonz/brainstonz.epj b/samples/games/brainstonz/brainstonz.epj
index d0b1002..467e84d 100644 (file)
--- a/samples/games/brainstonz/brainstonz.epj
+++ b/samples/games/brainstonz/brainstonz.epj
@@ -41,4 +41,4 @@
       "res/smile.png",
       "res/white.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/games/cards/poker/poker.epj b/samples/games/cards/poker/poker.epj
index 6f64aee..90b3ee5 100644 (file)
--- a/samples/games/cards/poker/poker.epj
+++ b/samples/games/cards/poker/poker.epj
@@ -16,8 +16,7 @@
          "Options" : {
             "Debug" : true,
             "Profile" : false,
-            "Optimization" : "None",
-            "ObjectsDirectory" : "obj"
+            "Optimization" : "None"
          }
       }
    ],
@@ -33,4 +32,4 @@
       "../res/cards.pcx",
       "../res/ecereCard.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/games/cards/ruff/ruff.epj b/samples/games/cards/ruff/ruff.epj
index 9472b4c..463465c 100644 (file)
--- a/samples/games/cards/ruff/ruff.epj
+++ b/samples/games/cards/ruff/ruff.epj
@@ -35,4 +35,4 @@
       "../res/hearts.bmp",
       "../res/spades.bmp"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/games/cards/tongIts/tongIts.epj b/samples/games/cards/tongIts/tongIts.epj
index 85328e9..badea5d 100644 (file)
--- a/samples/games/cards/tongIts/tongIts.epj
+++ b/samples/games/cards/tongIts/tongIts.epj
@@ -16,8 +16,7 @@
          "Options" : {
             "Debug" : true,
             "Profile" : false,
-            "Optimization" : "None",
-            "ObjectsDirectory" : "obj"
+            "Optimization" : "None"
          }
       }
    ],
@@ -29,4 +28,4 @@
       "../res/cards.pcx",
       "../res/ecereCard.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/games/othello/Othello.epj b/samples/games/othello/Othello.epj
index 450bd96..5391464 100644 (file)
--- a/samples/games/othello/Othello.epj
+++ b/samples/games/othello/Othello.epj
@@ -26,4 +26,4 @@
       "green.bmp",
       "othello.bmp"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/games/scrabble/scrabble.epj b/samples/games/scrabble/scrabble.epj
index 8348c21..c4ae293 100644 (file)
--- a/samples/games/scrabble/scrabble.epj
+++ b/samples/games/scrabble/scrabble.epj
@@ -49,4 +49,4 @@
       "res/dico.txt",
       "res/english.txt"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/games/tetris/tetris.epj b/samples/games/tetris/tetris.epj
index da3245d..9a5ef35 100644 (file)
--- a/samples/games/tetris/tetris.epj
+++ b/samples/games/tetris/tetris.epj
@@ -6,6 +6,7 @@
       "Profile" : false,
       "StrictNameSpaces" : false,
       "TargetType" : "Executable",
+      "TargetFileName" : "tetris",
       "Libraries" : [
          "ecere"
       ],
@@ -17,8 +18,7 @@
          "Options" : {
             "Debug" : true,
             "MemoryGuard" : false,
-            "Optimization" : "None",
-            "TargetFileName" : "tetris"
+            "Optimization" : "None"
          }
       },
       {
@@ -26,8 +26,7 @@
          "Options" : {
             "Debug" : false,
             "MemoryGuard" : false,
-            "Optimization" : "Speed",
-            "TargetFileName" : "tetris"
+            "Optimization" : "Speed"
          }
       },
       {
@@ -35,8 +34,7 @@
          "Options" : {
             "Debug" : true,
             "MemoryGuard" : true,
-            "Optimization" : "None",
-            "TargetFileName" : "tetris"
+            "Optimization" : "None"
          }
       }
    ],
@@ -47,4 +45,4 @@
    "Resources" : [
       "res/tetris.bmp"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/Controls/controls.ec b/samples/guiAndGfx/Controls/controls.ec
index b0d9d91..14e0c44 100644 (file)
--- a/samples/guiAndGfx/Controls/controls.ec
+++ b/samples/guiAndGfx/Controls/controls.ec
@@ -12,7 +12,7 @@ class ControlsSample : Window
 
    Button button1
    {
-      this, text = "Push Me", altP, isDefault = true, position = { 32, 40 };
+      this, caption = "Push Me", altP, isDefault = true, position = { 32, 40 };
 
       bool NotifyClicked(Button button, int x, int y, Modifiers mods)
       {
@@ -20,7 +20,7 @@ class ControlsSample : Window
          return true;
       }
    };
-   EditBox editBox1 { this, text = "EditBox 1", altE, size = { 78, 19 }, position = { 112, 40 }, contents = "contents" };
+   EditBox editBox1 { this, caption = "EditBox 1", altE, size = { 78, 19 }, position = { 112, 40 }, contents = "contents" };
    Label label1 { parent = this, size = { 45, 13 }, position = { 120, 16 }, labeledWindow = editBox1 };
 }
 ControlsSample controlsSample {};

diff --git a/samples/guiAndGfx/Controls/controls.epj b/samples/guiAndGfx/Controls/controls.epj
index 3d83490..e24a0b4 100644 (file)
--- a/samples/guiAndGfx/Controls/controls.epj
+++ b/samples/guiAndGfx/Controls/controls.epj
@@ -1,8 +1,6 @@
 {
    "Version" : 0.2,
    "ModuleName" : "Controls",
-   "Description" : "",
-   "License" : "",
    "Options" : {
       "Warnings" : "All",
       "MemoryGuard" : false,
@@ -36,4 +34,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/DataControls/DataControls.epj b/samples/guiAndGfx/DataControls/DataControls.epj
index 668eacb..9180156 100644 (file)
--- a/samples/guiAndGfx/DataControls/DataControls.epj
+++ b/samples/guiAndGfx/DataControls/DataControls.epj
@@ -39,4 +39,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/FlagsDropBox/FlagsDropBox.epj b/samples/guiAndGfx/FlagsDropBox/FlagsDropBox.epj
index 06c3d7d..5478bfb 100644 (file)
--- a/samples/guiAndGfx/FlagsDropBox/FlagsDropBox.epj
+++ b/samples/guiAndGfx/FlagsDropBox/FlagsDropBox.epj
@@ -292,4 +292,4 @@
          ]
       }
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/HelloForm/helloForm.epj b/samples/guiAndGfx/HelloForm/helloForm.epj
index ff81eec..d9932fe 100644 (file)
--- a/samples/guiAndGfx/HelloForm/helloForm.epj
+++ b/samples/guiAndGfx/HelloForm/helloForm.epj
@@ -1,8 +1,6 @@
 {
    "Version" : 0.2,
    "ModuleName" : "HelloForm",
-   "Description" : "",
-   "License" : "",
    "Options" : {
       "Warnings" : "All",
       "TargetType" : "Executable",
@@ -35,4 +33,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/LinkLabel/LinkLabel.epj b/samples/guiAndGfx/LinkLabel/LinkLabel.epj
index 36e6a1d..392931e 100644 (file)
--- a/samples/guiAndGfx/LinkLabel/LinkLabel.epj
+++ b/samples/guiAndGfx/LinkLabel/LinkLabel.epj
@@ -40,4 +40,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/bitmapsAndKB/Bitmap/bitmap.epj b/samples/guiAndGfx/bitmapsAndKB/Bitmap/bitmap.epj
index 8ae46ea..cb61258 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/Bitmap/bitmap.epj
+++ b/samples/guiAndGfx/bitmapsAndKB/Bitmap/bitmap.epj
@@ -35,4 +35,4 @@
    "Resources" : [
       "../res/castle.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/bitmapsAndKB/KBController/controller.epj b/samples/guiAndGfx/bitmapsAndKB/KBController/controller.epj
index 235e226..7f99b19 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/KBController/controller.epj
+++ b/samples/guiAndGfx/bitmapsAndKB/KBController/controller.epj
@@ -40,4 +40,4 @@
       "../res/mage.png",
       "../res/peasant.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.epj b/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.epj
index cc10828..005cfda 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.epj
+++ b/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.epj
@@ -40,4 +40,4 @@
       "../res/mage.png",
       "../res/peasant.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.epj b/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.epj
index c3da432..df50bc0 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.epj
+++ b/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.epj
@@ -40,4 +40,4 @@
       "../res/mage.png",
       "../res/peasant.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/bitmapsAndKB/Objects/objects.epj b/samples/guiAndGfx/bitmapsAndKB/Objects/objects.epj
index fcbaf4e..dac8828 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/Objects/objects.epj
+++ b/samples/guiAndGfx/bitmapsAndKB/Objects/objects.epj
@@ -40,4 +40,4 @@
       "../res/mage.png",
       "../res/peasant.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/childWindows/start.epj b/samples/guiAndGfx/childWindows/start.epj
index 5f28f92..4b8e85a 100644 (file)
--- a/samples/guiAndGfx/childWindows/start.epj
+++ b/samples/guiAndGfx/childWindows/start.epj
@@ -1,64 +1,39 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "ex1"
-
-Active Configuration = Debug
-
-   Configurations
-
-    + Debug
-
-         Compiler Options
-
-            Intermediate Directory = Debug
-            Debug = True
-            Optimize = None
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Modified = False
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = ex1
-            Target Type = Executable
-            Target Directory = Debug
-            Console = False
-            Modified = True
-
-            Libraries = ecere
-
-    + Release
-
-         Compiler Options
-
-            Intermediate Directory = Release
-            Debug = False
-            Optimize = Speed
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Modified = True
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = ex1
-            Target Type = Executable
-            Target Directory = Release
-            Console = False
-            Modified = True
-
-            Libraries = ecere
-
-   Files
-
-    - ex1.ec
-
-   Resources
-
-    = data/SoapBubbles.bmp
+{
+   "Version" : 0.2,
+   "ModuleName" : "ex1",
+   "Options" : {
+      "Warnings" : "All",
+      "MemoryGuard" : false,
+      "Profile" : false,
+      "StrictNameSpaces" : false,
+      "TargetType" : "Executable",
+      "TargetFileName" : "ex1",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None"
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "Optimization" : "Speed"
+         }
+      }
+   ],
+   "Files" : [
+      "ex1.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+      "data/SoapBubbles.bmp"
+   ]
+}

diff --git a/samples/guiAndGfx/clock/clock.epj b/samples/guiAndGfx/clock/clock.epj
index f64af1b..b1bc2db 100644 (file)
--- a/samples/guiAndGfx/clock/clock.epj
+++ b/samples/guiAndGfx/clock/clock.epj
@@ -1,56 +1,42 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "clock"
-
-   Configurations
-
-    + Debug
-
-         Compiler Options
-
-            Intermediate Directory = debug
-            Debug = True
-            Optimize = None
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-
-            Preprocessor Definitions = _DEBUG
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = clock
-            Target Type = Executable
-            Target Directory = debug
-            Console = False
-
-            Libraries = ecere
-
-    + Release
-
-         Compiler Options
-
-            Intermediate Directory = release
-            Debug = False
-            Optimize = Speed
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = clock
-            Target Type = Executable
-            Target Directory = release
-            Console = False
-
-            Libraries = ecere
-
-   Files
-
-    - clock.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "clock",
+   "Options" : {
+      "Warnings" : "All",
+      "MemoryGuard" : false,
+      "Profile" : false,
+      "StrictNameSpaces" : false,
+      "TargetType" : "Executable",
+      "TargetFileName" : "clock",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None",
+            "PreprocessorDefinitions" : [
+               "_DEBUG"
+            ]
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "Optimization" : "Speed"
+         }
+      }
+   ],
+   "Files" : [
+      "clock.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/guiAndGfx/curvyweb/curvyweb.epj b/samples/guiAndGfx/curvyweb/curvyweb.epj
index 856059a..8170ead 100644 (file)
--- a/samples/guiAndGfx/curvyweb/curvyweb.epj
+++ b/samples/guiAndGfx/curvyweb/curvyweb.epj
@@ -4,6 +4,7 @@
    "Options" : {
       "Warnings" : "All",
       "TargetType" : "Executable",
+      "TargetFileName" : "bezier",
       "Libraries" : [
          "ecere"
       ]
@@ -16,20 +17,14 @@
             "Optimization" : "None",
             "PreprocessorDefinitions" : [
                "_DEBUG"
-            ],
-            "TargetFileName" : "bezier",
-            "TargetDirectory" : "debug",
-            "ObjectsDirectory" : "debug"
+            ]
          }
       },
       {
          "Name" : "Release",
          "Options" : {
             "Debug" : false,
-            "Optimization" : "Speed",
-            "TargetFileName" : "bezier",
-            "TargetDirectory" : "release",
-            "ObjectsDirectory" : "release"
+            "Optimization" : "Speed"
          }
       }
    ],
@@ -40,4 +35,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/dataBoxes/dataBoxes.epj b/samples/guiAndGfx/dataBoxes/dataBoxes.epj
index 5375e0a..6821112 100644 (file)
--- a/samples/guiAndGfx/dataBoxes/dataBoxes.epj
+++ b/samples/guiAndGfx/dataBoxes/dataBoxes.epj
@@ -35,4 +35,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/disablingMovingControls/disabled_test.epj b/samples/guiAndGfx/disablingMovingControls/disabled_test.epj
index daa1078..d207e35 100644 (file)
--- a/samples/guiAndGfx/disablingMovingControls/disabled_test.epj
+++ b/samples/guiAndGfx/disablingMovingControls/disabled_test.epj
@@ -1,48 +1,38 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "disabled_test"
-
-   Configurations
-
-    + Debug
-
-         Compiler Options
-
-            Intermediate Directory = debug
-            Debug = True
-            Optimize = None
-            AllWarnings = True
-
-            Preprocessor Definitions = _DEBUG
-
-         Linker Options
-
-            Target Name = disabled_test
-            Target Type = Executable
-            Target Directory = debug
-
-            Libraries = ecere
-
-    + Release
-
-         Compiler Options
-
-            Intermediate Directory = release
-            Debug = False
-            Optimize = Speed
-            AllWarnings = True
-
-         Linker Options
-
-            Target Name = disabled_test
-            Target Type = Executable
-            Target Directory = release
-
-            Libraries = ecere
-
-   Files
-
-    - form2.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "disabled_test",
+   "Options" : {
+      "Warnings" : "All",
+      "TargetType" : "Executable",
+      "TargetFileName" : "disabled_test",
+      "Libraries" : [
+         "ecere"
+      ]
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None",
+            "PreprocessorDefinitions" : [
+               "_DEBUG"
+            ]
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "Optimization" : "Speed"
+         }
+      }
+   ],
+   "Files" : [
+      "form2.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/guiAndGfx/eNotepad/eNotepad.epj b/samples/guiAndGfx/eNotepad/eNotepad.epj
index bc32ef9..ffd7151 100644 (file)
--- a/samples/guiAndGfx/eNotepad/eNotepad.epj
+++ b/samples/guiAndGfx/eNotepad/eNotepad.epj
@@ -1,26 +1,30 @@
-
-ECERE Project File
-
-Version 0a
-
-Target "eNotepad"
-
-   Compiler Options
-
-      Intermediate Directory = obj
-      Debug = True
-      Optimize = False
-      Profile = False
-      AllWarnings = True
-
-   Linker Options
-
-      Target Name = eNotepad
-      Target Type = Executable
-      Console = False
-
-      Libraries = ecere
-
-   Files
-
-    - eNotepad.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "eNotepad",
+   "Options" : {
+      "Warnings" : "All",
+      "TargetType" : "Executable",
+      "TargetFileName" : "eNotepad",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Default",
+         "Options" : {
+            "Debug" : true,
+            "Profile" : false,
+            "Optimization" : "None"
+         }
+      }
+   ],
+   "Files" : [
+      "eNotepad.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/guiAndGfx/fliPlay/fliPlay.epj b/samples/guiAndGfx/fliPlay/fliPlay.epj
index 6c098df..6f88ccd 100644 (file)
--- a/samples/guiAndGfx/fliPlay/fliPlay.epj
+++ b/samples/guiAndGfx/fliPlay/fliPlay.epj
@@ -16,8 +16,7 @@
          "Options" : {
             "Debug" : true,
             "Profile" : false,
-            "Optimization" : "None",
-            "ObjectsDirectory" : "obj"
+            "Optimization" : "None"
          }
       }
    ],
@@ -30,4 +29,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/floodFill/ePaint.epj b/samples/guiAndGfx/floodFill/ePaint.epj
index 4f9fba5..13ce102 100644 (file)
--- a/samples/guiAndGfx/floodFill/ePaint.epj
+++ b/samples/guiAndGfx/floodFill/ePaint.epj
@@ -1,49 +1,39 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "ePaint"
-
-   Configurations
-
-    + Debug
-
-         Compiler Options
-
-            Intermediate Directory = debug
-            Debug = True
-            Optimize = None
-            AllWarnings = True
-
-            Preprocessor Definitions = _DEBUG
-
-         Linker Options
-
-            Target Name = ePaint
-            Target Type = Executable
-            Target Directory = debug
-            Console = True
-
-            Libraries = ecere
-
-    + Release
-
-         Compiler Options
-
-            Intermediate Directory = release
-            Debug = False
-            Optimize = Speed
-            AllWarnings = True
-
-         Linker Options
-
-            Target Name = ePaint
-            Target Type = Executable
-            Target Directory = release
-
-            Libraries = ecere
-
-   Files
-
-    - floodFill.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "ePaint",
+   "Options" : {
+      "Warnings" : "All",
+      "TargetType" : "Executable",
+      "TargetFileName" : "ePaint",
+      "Libraries" : [
+         "ecere"
+      ]
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None",
+            "PreprocessorDefinitions" : [
+               "_DEBUG"
+            ],
+            "Console" : true
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "Optimization" : "Speed"
+         }
+      }
+   ],
+   "Files" : [
+      "floodFill.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/guiAndGfx/mdiSample/mdiSample.epj b/samples/guiAndGfx/mdiSample/mdiSample.epj
index d900936..1bcabe9 100644 (file)
--- a/samples/guiAndGfx/mdiSample/mdiSample.epj
+++ b/samples/guiAndGfx/mdiSample/mdiSample.epj
@@ -35,4 +35,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/openrider/openrider.epj b/samples/guiAndGfx/openrider/openrider.epj
index 40f5733..5d8ae6e 100644 (file)
--- a/samples/guiAndGfx/openrider/openrider.epj
+++ b/samples/guiAndGfx/openrider/openrider.epj
@@ -4,6 +4,7 @@
    "Options" : {
       "Warnings" : "All",
       "TargetType" : "Executable",
+      "TargetFileName" : "openrider",
       "Libraries" : [
          "ecere"
       ]
@@ -16,16 +17,14 @@
             "Optimization" : "None",
             "PreprocessorDefinitions" : [
                "_DEBUG"
-            ],
-            "TargetFileName" : "openrider"
+            ]
          }
       },
       {
          "Name" : "Release",
          "Options" : {
             "Debug" : false,
-            "Optimization" : "Speed",
-            "TargetFileName" : "openrider"
+            "Optimization" : "Speed"
          }
       }
    ],
@@ -38,4 +37,4 @@
    "Resources" : [
       "wheel.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/reminder/Reminder.ec b/samples/guiAndGfx/reminder/Reminder.ec
index 983efdd..499df35 100644 (file)
--- a/samples/guiAndGfx/reminder/Reminder.ec
+++ b/samples/guiAndGfx/reminder/Reminder.ec
@@ -51,7 +51,7 @@ class ReminderWindow : Window
    Label note { this, text = "Note", position = { 16, 160 }, anchor = { left = 10, bottom = 10 } };
    Button remindMe 
    {
-      this, text = "Remind Me", escape, anchor = { right = 54, bottom = 10 };
+      this, caption = "Remind Me", escape, anchor = { right = 54, bottom = 10 };
 
       bool NotifyClicked(Button button, int x, int y, Modifiers mods)
       {

diff --git a/samples/guiAndGfx/reminder/Reminder.epj b/samples/guiAndGfx/reminder/Reminder.epj
index c390b16..8209892 100644 (file)
--- a/samples/guiAndGfx/reminder/Reminder.epj
+++ b/samples/guiAndGfx/reminder/Reminder.epj
@@ -5,8 +5,6 @@
       "Warnings" : "All",
       "TargetType" : "Executable",
       "TargetFileName" : "Reminder",
-      "TargetDirectory" : "obj/$(Project)-$(Platform)-$(Config)",
-      "ObjectsDirectory" : "obj/$(Project)-$(Platform)-$(Config)",
       "Libraries" : [
          "ecere"
       ]
@@ -38,4 +36,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/replace/replace.epj b/samples/guiAndGfx/replace/replace.epj
index 8d41686..46db5f8 100644 (file)
--- a/samples/guiAndGfx/replace/replace.epj
+++ b/samples/guiAndGfx/replace/replace.epj
@@ -1,26 +1,30 @@
-
-ECERE Project File
-
-Version 0a
-
-Target "replace"
-
-   Compiler Options
-
-      Intermediate Directory = obj
-      Debug = True
-      Optimize = False
-      Profile = False
-      AllWarnings = True
-
-   Linker Options
-
-      Target Name = replace
-      Target Type = Executable
-      Console = False
-
-      Libraries = ecere
-
-   Files
-
-    - replace.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "replace",
+   "Options" : {
+      "Warnings" : "All",
+      "TargetType" : "Executable",
+      "TargetFileName" : "replace",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Default",
+         "Options" : {
+            "Debug" : true,
+            "Profile" : false,
+            "Optimization" : "None"
+         }
+      }
+   ],
+   "Files" : [
+      "replace.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/guiAndGfx/screenShot/Shot.epj b/samples/guiAndGfx/screenShot/Shot.epj
index 5e4a03f..9d12548 100644 (file)
--- a/samples/guiAndGfx/screenShot/Shot.epj
+++ b/samples/guiAndGfx/screenShot/Shot.epj
@@ -39,4 +39,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/skinning/SkinProject.epj b/samples/guiAndGfx/skinning/SkinProject.epj
index 8d15c46..4abc808 100644 (file)
--- a/samples/guiAndGfx/skinning/SkinProject.epj
+++ b/samples/guiAndGfx/skinning/SkinProject.epj
@@ -65,4 +65,4 @@
       "upMiddle.png",
       "upRight.png"
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/slideShow/eShow.epj b/samples/guiAndGfx/slideShow/eShow.epj
index 67768ce..93a405a 100644 (file)
--- a/samples/guiAndGfx/slideShow/eShow.epj
+++ b/samples/guiAndGfx/slideShow/eShow.epj
@@ -1,36 +1,30 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "eShow"
-
-Active Configuration = Default
-
-   Configurations
-
-    + Default
-
-         Compiler Options
-
-            Intermediate Directory = obj
-            Debug = True
-            Optimize = None
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Modified = False
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = eShow
-            Target Type = Executable
-            Console = False
-            Modified = False
-
-            Libraries = ecere
-
-   Files
-
-    - eShow.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "eShow",
+   "Options" : {
+      "Warnings" : "All",
+      "Debug" : true,
+      "MemoryGuard" : false,
+      "Profile" : false,
+      "Optimization" : "None",
+      "StrictNameSpaces" : false,
+      "TargetType" : "Executable",
+      "TargetFileName" : "eShow",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Default"
+      }
+   ],
+   "Files" : [
+      "eShow.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/guiAndGfx/snow/snow.epj b/samples/guiAndGfx/snow/snow.epj
index e67000b..f9872e2 100644 (file)
--- a/samples/guiAndGfx/snow/snow.epj
+++ b/samples/guiAndGfx/snow/snow.epj
@@ -45,4 +45,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/stacker/stackerTest.epj b/samples/guiAndGfx/stacker/stackerTest.epj
index 94b0b80..8ca7b05 100644 (file)
--- a/samples/guiAndGfx/stacker/stackerTest.epj
+++ b/samples/guiAndGfx/stacker/stackerTest.epj
@@ -10,8 +10,6 @@
       ],
       "TargetType" : "Executable",
       "TargetFileName" : "test",
-      "TargetDirectory" : "obj",
-      "ObjectsDirectory" : "obj",
       "Libraries" : [
          "ecere"
       ]
@@ -28,4 +26,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/tabControl/tabs.epj b/samples/guiAndGfx/tabControl/tabs.epj
index 65505d8..e50624f 100644 (file)
--- a/samples/guiAndGfx/tabControl/tabs.epj
+++ b/samples/guiAndGfx/tabControl/tabs.epj
@@ -1,14 +1,13 @@
 {
    "Version" : 0.2,
    "ModuleName" : "tabs",
-   "Description" : "",
-   "License" : "",
    "Options" : {
       "Warnings" : "All",
       "MemoryGuard" : false,
       "Profile" : false,
       "StrictNameSpaces" : false,
       "TargetType" : "Executable",
+      "TargetFileName" : "tabs",
       "Libraries" : [
          "ecere"
       ],
@@ -22,18 +21,14 @@
             "Optimization" : "None",
             "PreprocessorDefinitions" : [
                "_DEBUG"
-            ],
-            "TargetFileName" : "tabs",
-            "ObjectsDirectory" : "debug"
+            ]
          }
       },
       {
          "Name" : "Release",
          "Options" : {
             "Debug" : false,
-            "Optimization" : "Speed",
-            "TargetFileName" : "KenSample",
-            "ObjectsDirectory" : "release"
+            "Optimization" : "Speed"
          }
       }
    ],
@@ -44,4 +39,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/textScroller/Scroll.epj b/samples/guiAndGfx/textScroller/Scroll.epj
index a6e9814..9137358 100644 (file)
--- a/samples/guiAndGfx/textScroller/Scroll.epj
+++ b/samples/guiAndGfx/textScroller/Scroll.epj
@@ -35,4 +35,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/toolBars/toolBars.epj b/samples/guiAndGfx/toolBars/toolBars.epj
index ef9e1ff..6c0d906 100644 (file)
--- a/samples/guiAndGfx/toolBars/toolBars.epj
+++ b/samples/guiAndGfx/toolBars/toolBars.epj
@@ -37,4 +37,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/toolTips/Tooltips.epj b/samples/guiAndGfx/toolTips/Tooltips.epj
index e4c7df4..a53f74c 100644 (file)
--- a/samples/guiAndGfx/toolTips/Tooltips.epj
+++ b/samples/guiAndGfx/toolTips/Tooltips.epj
@@ -45,4 +45,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/guiAndGfx/treeView/treeView.epj b/samples/guiAndGfx/treeView/treeView.epj
index 6449ce6..de6cf50 100644 (file)
--- a/samples/guiAndGfx/treeView/treeView.epj
+++ b/samples/guiAndGfx/treeView/treeView.epj
@@ -1,26 +1,30 @@
-
-ECERE Project File
-
-Version 0a
-
-Target "treeView"
-
-   Compiler Options
-
-      Intermediate Directory = obj
-      Debug = True
-      Optimize = False
-      Profile = False
-      AllWarnings = True
-
-   Linker Options
-
-      Target Name = treeView
-      Target Type = Executable
-      Console = False
-
-      Libraries = ecere
-
-   Files
-
-    - explorer.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "treeView",
+   "Options" : {
+      "Warnings" : "All",
+      "TargetType" : "Executable",
+      "TargetFileName" : "treeView",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Default",
+         "Options" : {
+            "Debug" : true,
+            "Profile" : false,
+            "Optimization" : "None"
+         }
+      }
+   ],
+   "Files" : [
+      "explorer.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/misc/licensing/licensing.epj b/samples/misc/licensing/licensing.epj
index 863de98..2214f30 100644 (file)
--- a/samples/misc/licensing/licensing.epj
+++ b/samples/misc/licensing/licensing.epj
@@ -44,4 +44,4 @@
          ]
       }
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/net/DCOMSample/Server.epj b/samples/net/DCOMSample/Server.epj
index 5c6be3f..5a6d067 100644 (file)
--- a/samples/net/DCOMSample/Server.epj
+++ b/samples/net/DCOMSample/Server.epj
@@ -1,59 +1,44 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "Server"
-
-   Configurations
-
-    + Debug
-
-         Compiler Options
-
-            Intermediate Directory = debug
-            Debug = True
-            Optimize = None
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-
-            Preprocessor Definitions = _DEBUG
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = Server
-            Target Type = Executable
-            Target Directory = debug
-            Console = False
-            Compress = False
-
-            Libraries = ecere
-
-    + Release
-
-         Compiler Options
-
-            Intermediate Directory = release
-            Debug = False
-            Optimize = Speed
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = Server
-            Target Type = Executable
-            Target Directory = release
-            Console = False
-            Compress = False
-
-            Libraries = ecere
-
-   Files
-
-    - main.ec
-    - Server.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "Server",
+   "Options" : {
+      "Warnings" : "All",
+      "MemoryGuard" : false,
+      "Profile" : false,
+      "StrictNameSpaces" : false,
+      "TargetType" : "Executable",
+      "TargetFileName" : "Server",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : false,
+      "Compress" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None",
+            "PreprocessorDefinitions" : [
+               "_DEBUG"
+            ]
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "Optimization" : "Speed"
+         }
+      }
+   ],
+   "Files" : [
+      "main.ec",
+      "Server.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/net/SocketSample/SocketSample.epj b/samples/net/SocketSample/SocketSample.epj
index 9d9177e..f2c25a2 100644 (file)
--- a/samples/net/SocketSample/SocketSample.epj
+++ b/samples/net/SocketSample/SocketSample.epj
@@ -35,4 +35,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/net/UDPSample/UDPTest.epj b/samples/net/UDPSample/UDPTest.epj
index a65c7d1..75d1593 100644 (file)
--- a/samples/net/UDPSample/UDPTest.epj
+++ b/samples/net/UDPSample/UDPTest.epj
@@ -51,4 +51,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/net/XMLSample/XMLSample.epj b/samples/net/XMLSample/XMLSample.epj
index 1660249..656881b 100644 (file)
--- a/samples/net/XMLSample/XMLSample.epj
+++ b/samples/net/XMLSample/XMLSample.epj
@@ -36,4 +36,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/net/eCom/eCom.epj b/samples/net/eCom/eCom.epj
index 7c5a54f..cc34bbc 100644 (file)
--- a/samples/net/eCom/eCom.epj
+++ b/samples/net/eCom/eCom.epj
@@ -7,6 +7,7 @@
       "Profile" : false,
       "StrictNameSpaces" : false,
       "TargetType" : "Executable",
+      "TargetFileName" : "eCom",
       "Libraries" : [
          "ecere"
       ],
@@ -17,16 +18,14 @@
          "Name" : "Debug",
          "Options" : {
             "Debug" : true,
-            "Optimization" : "None",
-            "TargetFileName" : "eCom"
+            "Optimization" : "None"
          }
       },
       {
          "Name" : "Release",
          "Options" : {
             "Debug" : false,
-            "Optimization" : "Speed",
-            "TargetFileName" : "eCom"
+            "Optimization" : "Speed"
          }
       }
    ],
@@ -38,4 +37,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/net/eirc/eIRC.epj b/samples/net/eirc/eIRC.epj
index f58ee64..458abb4 100644 (file)
--- a/samples/net/eirc/eIRC.epj
+++ b/samples/net/eirc/eIRC.epj
@@ -7,6 +7,7 @@
       "Profile" : false,
       "StrictNameSpaces" : false,
       "TargetType" : "Executable",
+      "TargetFileName" : "eIRC",
       "Libraries" : [
          "ecere"
       ],
@@ -21,20 +22,14 @@
             "Optimization" : "None",
             "PreprocessorDefinitions" : [
                "_DEBUG"
-            ],
-            "TargetFileName" : "eIRC",
-            "TargetDirectory" : "debug",
-            "ObjectsDirectory" : "debug"
+            ]
          }
       },
       {
          "Name" : "Release",
          "Options" : {
             "Debug" : false,
-            "Optimization" : "Speed",
-            "TargetFileName" : "eIRC",
-            "TargetDirectory" : "release",
-            "ObjectsDirectory" : "release"
+            "Optimization" : "Speed"
          }
       }
    ],
@@ -46,4 +41,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/net/httpserver/httpServer.epj b/samples/net/httpserver/httpServer.epj
index 53afb40..e426ae6 100644 (file)
--- a/samples/net/httpserver/httpServer.epj
+++ b/samples/net/httpserver/httpServer.epj
@@ -29,4 +29,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/net/networkFile/NetworkClient/NetworkClient.epj b/samples/net/networkFile/NetworkClient/NetworkClient.epj
index 171e914..376ea46 100644 (file)
--- a/samples/net/networkFile/NetworkClient/NetworkClient.epj
+++ b/samples/net/networkFile/NetworkClient/NetworkClient.epj
@@ -1,56 +1,42 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "NetworkClient"
-
-   Configurations
-
-    + Debug
-
-         Compiler Options
-
-            Intermediate Directory = Debug
-            Debug = True
-            Optimize = None
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-
-            Preprocessor Definitions = _DEBUG
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = NetworkClient
-            Target Type = Executable
-            Target Directory = Debug
-            Console = False
-
-            Libraries = ecere
-
-    + Release
-
-         Compiler Options
-
-            Intermediate Directory = Release
-            Debug = False
-            Optimize = Speed
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = NetworkClient
-            Target Type = Executable
-            Target Directory = Release
-            Console = False
-
-            Libraries = ecere
-
-   Files
-
-    - client.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "NetworkClient",
+   "Options" : {
+      "Warnings" : "All",
+      "MemoryGuard" : false,
+      "Profile" : false,
+      "StrictNameSpaces" : false,
+      "TargetType" : "Executable",
+      "TargetFileName" : "NetworkClient",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None",
+            "PreprocessorDefinitions" : [
+               "_DEBUG"
+            ]
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "Optimization" : "Speed"
+         }
+      }
+   ],
+   "Files" : [
+      "client.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/net/networkFile/NetworkServer/NetworkServer.epj b/samples/net/networkFile/NetworkServer/NetworkServer.epj
index 8b0b0e3..45046f8 100644 (file)
--- a/samples/net/networkFile/NetworkServer/NetworkServer.epj
+++ b/samples/net/networkFile/NetworkServer/NetworkServer.epj
@@ -1,32 +1,30 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "NetworkServer"
-
-   Configurations
-
-    + Default
-
-         Compiler Options
-
-            Intermediate Directory = obj
-            Debug = True
-            Optimize = None
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = Server
-            Target Type = Executable
-            Console = False
-
-            Libraries = ecere
-
-   Files
-
-    - server.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "NetworkServer",
+   "Options" : {
+      "Warnings" : "All",
+      "Debug" : true,
+      "MemoryGuard" : false,
+      "Profile" : false,
+      "Optimization" : "None",
+      "StrictNameSpaces" : false,
+      "TargetType" : "Executable",
+      "TargetFileName" : "Server",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Default"
+      }
+   ],
+   "Files" : [
+      "server.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/net/smtp/smtp.epj b/samples/net/smtp/smtp.epj
index 65bec3a..eec250e 100644 (file)
--- a/samples/net/smtp/smtp.epj
+++ b/samples/net/smtp/smtp.epj
@@ -1,62 +1,43 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "smtp"
-
-Active Configuration = Debug
-
-   Configurations
-
-    + Debug
-
-         Compiler Options
-
-            Intermediate Directory = debug
-            Debug = True
-            Optimize = None
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Modified = False
-
-            Preprocessor Definitions = _DEBUG
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = smtp
-            Target Type = Executable
-            Target Directory = debug
-            Console = True
-            Modified = False
-
-            Libraries = ecere
-
-    + Release
-
-         Compiler Options
-
-            Intermediate Directory = release
-            Debug = False
-            Optimize = Speed
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Modified = False
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = smtp
-            Target Type = Executable
-            Target Directory = release
-            Console = False
-            Modified = False
-
-            Libraries = ecere
-
-   Files
-
-    - smtp.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "smtp",
+   "Options" : {
+      "Warnings" : "All",
+      "MemoryGuard" : false,
+      "Profile" : false,
+      "StrictNameSpaces" : false,
+      "TargetType" : "Executable",
+      "TargetFileName" : "smtp",
+      "Libraries" : [
+         "ecere"
+      ]
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None",
+            "PreprocessorDefinitions" : [
+               "_DEBUG"
+            ],
+            "Console" : true
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "Optimization" : "Speed",
+            "Console" : false
+         }
+      }
+   ],
+   "Files" : [
+      "smtp.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}

diff --git a/samples/scanning/wiaTest/wiaTest.epj b/samples/scanning/wiaTest/wiaTest.epj
index 7567ce9..05b2a49 100644 (file)
--- a/samples/scanning/wiaTest/wiaTest.epj
+++ b/samples/scanning/wiaTest/wiaTest.epj
@@ -49,4 +49,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/samples/threads/threadsAndListBoxes/blank.epj b/samples/threads/threadsAndListBoxes/blank.epj
index a6698f3..c0da64c 100644 (file)
--- a/samples/threads/threadsAndListBoxes/blank.epj
+++ b/samples/threads/threadsAndListBoxes/blank.epj
@@ -1,60 +1,39 @@
-
-ECERE Project File
-
-Version 0.1a
-
-Target "blank"
-
-Active Configuration = Debug
-
-   Configurations
-
-    + Debug
-
-         Compiler Options
-
-            Intermediate Directory = Debug
-            Debug = True
-            Optimize = None
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Modified = False
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = blank
-            Target Type = Executable
-            Target Directory = Debug
-            Console = False
-            Modified = True
-
-            Libraries = ecere
-
-    + Release
-
-         Compiler Options
-
-            Intermediate Directory = Release
-            Debug = False
-            Optimize = Speed
-            Profile = False
-            MemoryGuard = False
-            AllWarnings = True
-            Modified = True
-            Strict Name Spaces = False
-
-         Linker Options
-
-            Target Name = blank
-            Target Type = Executable
-            Target Directory = Release
-            Console = False
-            Modified = True
-
-            Libraries = ecere
-
-   Files
-
-    - blank.ec
+{
+   "Version" : 0.2,
+   "ModuleName" : "blank",
+   "Options" : {
+      "Warnings" : "All",
+      "MemoryGuard" : false,
+      "Profile" : false,
+      "StrictNameSpaces" : false,
+      "TargetType" : "Executable",
+      "TargetFileName" : "blank",
+      "Libraries" : [
+         "ecere"
+      ],
+      "Console" : false
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None"
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "Optimization" : "Speed"
+         }
+      }
+   ],
+   "Files" : [
+      "blank.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+
+   ]
+}