Forráskód Böngészése

use neko 64 on win64

Aleksandr Kuzmenko 6 éve
szülő
commit
9c3155170e
3 módosított fájl, 11 hozzáadás és 3 törlés
  1. 6 1
      Makefile.win
  2. 4 1
      extra/azure-pipelines/build-windows.yml
  3. 1 1
      extra/installer.nsi

+ 6 - 1
Makefile.win

@@ -6,6 +6,11 @@ HAXELIB_OUTPUT=haxelib.exe
 PREBUILD_OUTPUT=prebuild.exe
 EXTENSION=.exe
 PACKAGE_SRC_EXTENSION=.zip
+ARCH?=32
+
+ifeq ($(ARCH),64)
+NEKO_ARCH_STR=64
+endif
 
 kill:
 	-@taskkill /F /IM haxe.exe
@@ -66,7 +71,7 @@ package_choco:
 	rm -rf out/choco
 
 $(INSTALLER_TMP_DIR)/neko-win.zip: $(INSTALLER_TMP_DIR)
-	wget -nv http://nekovm.org/media/neko-2.1.0-win.zip -O installer/neko-win.zip
+	wget -nv http://nekovm.org/media/neko-2.1.0-$(NEKO_ARCH_STR).zip -O installer/neko-win.zip
 
 package_installer_win: $(INSTALLER_TMP_DIR)/neko-win.zip package_win
 	$(eval OUTFILE := $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_installer.zip)

+ 4 - 1
extra/azure-pipelines/build-windows.yml

@@ -31,7 +31,10 @@ jobs:
         displayName: Install dependencies
       - template: install-neko-snapshot.yaml
         parameters:
-          platform: windows
+          ${{ if eq(parameters.arch, '64') }}:
+            platform: windows64
+          ${{ if eq(parameters.arch, '32') }}:
+            platform: windows
       - powershell: |
           Set-PSDebug -Trace 1
           curl.exe -fsSL -o cygwin-setup.exe --retry 3 $(CYGWIN_SETUP)

+ 1 - 1
extra/installer.nsi

@@ -20,7 +20,7 @@
 !define VERLONG "%%VERLONG%%"
 
 ; Define Neko info
-!define NEKO_VERSION "2.1.0"
+!define NEKO_VERSION "2.2.0"
 
 ; Installer details
 VIAddVersionKey "CompanyName" "Haxe Foundation"