X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=308f0c9523513a0b9ea7f5c36569b6b28e9a1863;hp=68745a5d615e1e4bdab3a2ddabb27d43e3ffdcbc;hb=51d5e483a5d8b50e0c0956053e0e264c20382928;hpb=2b5c16a79d408a99d4df883f0779038c78dd285f

diff --git a/Makefile b/Makefile
index 68745a5d..308f0c95 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ MAKE = make
 # JOYSTICK = -DNO_JOYSTICK
 
 # path for cross-compiling (only needed for non-native Windows build)
-CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
+CROSS_PATH_WIN32 = /usr/local/cross-tools/i686-w64-mingw32
+CROSS_PATH_WIN64 = /usr/local/cross-tools/x86_64-w64-mingw32
 
 
 # -----------------------------------------------------------------------------
@@ -49,7 +50,7 @@ CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
 .EXPORT_ALL_VARIABLES:
 
 SRC_DIR = src
-ANDROID_DIR ?= android
+ANDROID_DIR ?= build-projects/android
 
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR)
@@ -62,30 +63,18 @@ MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR)
 all:
 	@$(MAKE_CMD)
 
-sdl:
-	@$(MAKE_CMD) TARGET=sdl
-
-sdl2:
-	@$(MAKE_CMD) TARGET=sdl2
-
-mac:
-	@$(MAKE_CMD) PLATFORM=macosx
-
 cross-win32:
 	@PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
 
-android-compile:
-	@$(MAKE_CMD_ANDROID) compile
+cross-win64:
+	@PATH=$(CROSS_PATH_WIN64)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win64
+
+android-prepare:
+	@$(MAKE_CMD_ANDROID) prepare
 
 android-package:
 	@$(MAKE_CMD_ANDROID) package
 
-android-install:
-	@$(MAKE_CMD_ANDROID) install
-
-android-assets-toc:
-	@$(MAKE_CMD_ANDROID) assets-toc
-
 android-clean:
 	@$(MAKE_CMD_ANDROID) clean
 
@@ -110,6 +99,9 @@ MAKE_LEVELSKETCH = ./Scripts/make_levelsketch_images.sh
 auto-conf:
 	@$(MAKE_CMD) auto-conf
 
+conf-time:
+	@$(MAKE_CMD) conf-time
+
 run: all
 	@$(MAKE_CMD) run
 
@@ -162,6 +154,9 @@ dist-build-unix:
 dist-build-win32:
 	@BUILD_DIST=TRUE $(MAKE) cross-win32
 
+dist-build-win64:
+	@BUILD_DIST=TRUE $(MAKE) cross-win64
+
 dist-build-macosx:
 	@BUILD_DIST=TRUE $(MAKE)
 
@@ -172,7 +167,10 @@ dist-package-unix:
 	$(MAKE_DIST) package unix
 
 dist-package-win32:
-	$(MAKE_DIST) package win
+	$(MAKE_DIST) package win32
+
+dist-package-win64:
+	$(MAKE_DIST) package win64
 
 dist-package-macosx:
 	$(MAKE_DIST) package mac
@@ -184,7 +182,10 @@ dist-copy-package-unix:
 	$(MAKE_DIST) copy-package unix
 
 dist-copy-package-win32:
-	$(MAKE_DIST) copy-package win
+	$(MAKE_DIST) copy-package win32
+
+dist-copy-package-win64:
+	$(MAKE_DIST) copy-package win64
 
 dist-copy-package-macosx:
 	$(MAKE_DIST) copy-package mac
@@ -196,7 +197,10 @@ dist-upload-unix:
 	$(MAKE_DIST) upload unix
 
 dist-upload-win32:
-	$(MAKE_DIST) upload win
+	$(MAKE_DIST) upload win32
+
+dist-upload-win64:
+	$(MAKE_DIST) upload win64
 
 dist-upload-macosx:
 	$(MAKE_DIST) upload mac
@@ -207,18 +211,21 @@ dist-upload-android:
 dist-package-all:
 	$(MAKE) dist-package-unix
 	$(MAKE) dist-package-win32
+	$(MAKE) dist-package-win64
 	$(MAKE) dist-package-macosx
 	$(MAKE) dist-package-android
 
 dist-copy-package-all:
 	$(MAKE) dist-copy-package-unix
 	$(MAKE) dist-copy-package-win32
+	$(MAKE) dist-copy-package-win64
 	$(MAKE) dist-copy-package-macosx
 	$(MAKE) dist-copy-package-android
 
 dist-upload-all:
 	$(MAKE) dist-upload-unix
 	$(MAKE) dist-upload-win32
+	$(MAKE) dist-upload-win64
 	$(MAKE) dist-upload-macosx
 	$(MAKE) dist-upload-android