From 7c6bab15abc974ce4a8043b1d8753cd0c6806cf0 Mon Sep 17 00:00:00 2001 From: Hugh Sanderson Date: Sat, 1 Feb 2025 13:57:51 +0800 Subject: [PATCH] Update to version 7. Use NME_LOCAL_TOOLKIT by default --- .github/workflows/main.yml | 15 +- haxelib.json | 6 +- project/Build.xml | 504 --------------------------- project/ToolkitBuild.xml | 5 +- project/include/NmeVersion.h | 4 +- project/src/opengl/OpenGLContext.cpp | 3 +- src/nme/Version.hx | 4 +- tools/version/Write.hx | 6 + 8 files changed, 26 insertions(+), 521 deletions(-) delete mode 100644 project/Build.xml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d66e05ea..a6e034bf6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,21 +11,22 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Update Submodules + run: | + git submodule update --init --depth 1 --checkout + - uses: krdlab/setup-haxe@v1.5.1 with: haxe-version: 4.3.4 - + - name: Install haxelibs run: | - git submodule init - git submodule update haxe -version haxelib install gm2d haxelib install format - haxelib install nme-toolkit haxelib install hxcpp haxelib dev nme . - + - name: Set Version run: haxe -cp tools/version --run Write ${{github.run_number}} ${{github.sha}} > version.env @@ -99,8 +100,8 @@ jobs: assets Changes.md LICENSE - - + !project/**/.git* + - name: Archive Windows Results if: startsWith(matrix.os,'windows') uses: actions/upload-artifact@v4 diff --git a/haxelib.json b/haxelib.json index 1edcbcb4d..67b6e1049 100644 --- a/haxelib.json +++ b/haxelib.json @@ -2,9 +2,9 @@ "name": "nme", "url": "https://github.com/nmehost", "license": "MIT", - "tags": [ "cpp", "neko", "nme", "opengl", "sdl", "android", "ios" ], - "description": "NME provides a backend for native iOS, Android, Windows, Mac and Linux applications, using a Flash inspired API", - "version": "6.3.0", + "tags": [ "cpp", "neko", "nme", "opengl", "sdl", "android", "ios", "wasm" ], + "description": "NME provides a backend for native iOS, Android, Wasm, Windows, Mac and Linux applications, using a Flash inspired API", + "version": "7.0.0", "binaryversion": "101", "classPath": "src", "releasenote": "see Changes.md", diff --git a/project/Build.xml b/project/Build.xml deleted file mode 100644 index 4b8fc6e6f..000000000 --- a/project/Build.xml +++ /dev/null @@ -1,504 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- -
- - - - - -
- -
- - - -
- -
- - - - - - -
- -
- - - - - - - - - -
- -
- - - - - - - - - -
- -
- -
- -
- - -
- - -
- - - - - - -
- -
- - - - - - -
- -
- -
- -
- - - - - - -
- -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - -
- - - -
- - - -
- -
- - -
-
- -
- - - - -
- - - - -
- - - -
- - - -
- -
- - -
-
- - - -
- - - - - - - -
- - - - - - -
- - -
- - - - - - - - - - - - - - -
- - -
- - - - - -
- -
- - - -
- - -
- - - - - - - - - - - - - - - -
- -
- - - -
- -
- -
- -
- - - - - - - - - - diff --git a/project/ToolkitBuild.xml b/project/ToolkitBuild.xml index ebdcc3a1c..063f34e34 100644 --- a/project/ToolkitBuild.xml +++ b/project/ToolkitBuild.xml @@ -10,6 +10,8 @@ + + @@ -27,8 +29,7 @@ - - + diff --git a/project/include/NmeVersion.h b/project/include/NmeVersion.h index d3d97f45f..bc8fb8d56 100644 --- a/project/include/NmeVersion.h +++ b/project/include/NmeVersion.h @@ -1,3 +1,3 @@ -#ifndef NME_VERSION_NAME -#define NME_VERSION_NAME "5.0.0" +#ifndef NME_VERSION +#define NME_VERSION "7.0.0" #endif diff --git a/project/src/opengl/OpenGLContext.cpp b/project/src/opengl/OpenGLContext.cpp index 13029004e..04d49ae43 100644 --- a/project/src/opengl/OpenGLContext.cpp +++ b/project/src/opengl/OpenGLContext.cpp @@ -947,7 +947,8 @@ bool InitDynamicGLES() gEGLLibraryHandle = LoadLibraryA("libEGL.dll"); if (!gEGLLibraryHandle) { - fprintf(stderr,"ERROR: Could not open libEGL\n"); + // Silent fail for now + //fprintf(stderr,"ERROR: Could not open libEGL\n"); nmeEglMode = false; } else diff --git a/src/nme/Version.hx b/src/nme/Version.hx index 99dd003b4..c59ced281 100644 --- a/src/nme/Version.hx +++ b/src/nme/Version.hx @@ -1,4 +1,4 @@ package nme; class Version { - public static inline var name="6.0.0"; -} + public static inline var name="7.0.1"; +} \ No newline at end of file diff --git a/tools/version/Write.hx b/tools/version/Write.hx index 2a80444ca..94fc34dce 100644 --- a/tools/version/Write.hx +++ b/tools/version/Write.hx @@ -2,6 +2,8 @@ import sys.io.File; class Write { + static var baseVersion = 150; + public static function main() { var args = Sys.args(); @@ -10,6 +12,10 @@ class Write if (buildNumber<1 || buildNumber==null || gitVersion==null) throw "Usage: Write buildNumber GITVER"; + buildNumber -= baseVersion; + if (buildNumber<0) + buildNumber = 0; + var jsonFile = "haxelib.json"; var lines = File.getContent(jsonFile).split("\n");