projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with unnecessarily reloading custom artwork on ECS/AGA change
[rocksndiamonds.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 9dbdfe2bb4c92df5776b0b0161e96f38aac8f894..5dd17c24025faf37cbb80391e642918d2813c873 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-4,7
+4,7
@@
# (c) 1995-2015 by Artsoft Entertainment
# Holger Schemel
# info@artsoft.org
# (c) 1995-2015 by Artsoft Entertainment
# Holger Schemel
# info@artsoft.org
-# http://www.artsoft.org/
+# http
s
://www.artsoft.org/
# -----------------------------------------------------------------------------
# Makefile
# =============================================================================
# -----------------------------------------------------------------------------
# Makefile
# =============================================================================
@@
-39,7
+39,8
@@
MAKE = make
# JOYSTICK = -DNO_JOYSTICK
# path for cross-compiling (only needed for non-native Windows build)
# 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
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
@@
-62,35
+63,26
@@
MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR)
all:
@$(MAKE_CMD)
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
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-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
android: android-package
android-clean:
@$(MAKE_CMD_ANDROID) clean
android: android-package
+emscripten:
+ @emmake $(MAKE_CMD) PLATFORM=emscripten
+
clean:
@$(MAKE_CMD) clean
clean:
@$(MAKE_CMD) clean
@@
-110,6
+102,12
@@
MAKE_LEVELSKETCH = ./Scripts/make_levelsketch_images.sh
auto-conf:
@$(MAKE_CMD) auto-conf
auto-conf:
@$(MAKE_CMD) auto-conf
+conf-time:
+ @$(MAKE_CMD) conf-time
+
+conf-hash:
+ @$(MAKE_CMD) conf-hash
+
run: all
@$(MAKE_CMD) run
run: all
@$(MAKE_CMD) run
@@
-156,70
+154,88
@@
dist-clean:
dist-clean-android:
@$(MAKE_CMD_ANDROID) dist-clean
dist-clean-android:
@$(MAKE_CMD_ANDROID) dist-clean
-dist-build-
uni
x:
+dist-build-
linu
x:
@BUILD_DIST=TRUE $(MAKE)
dist-build-win32:
@BUILD_DIST=TRUE $(MAKE) cross-win32
@BUILD_DIST=TRUE $(MAKE)
dist-build-win32:
@BUILD_DIST=TRUE $(MAKE) cross-win32
-dist-build-macosx:
+dist-build-win64:
+ @BUILD_DIST=TRUE $(MAKE) cross-win64
+
+dist-build-mac:
@BUILD_DIST=TRUE $(MAKE)
dist-build-android:
@BUILD_DIST=TRUE $(MAKE) android
@BUILD_DIST=TRUE $(MAKE)
dist-build-android:
@BUILD_DIST=TRUE $(MAKE) android
-dist-package-unix:
- $(MAKE_DIST) package unix
+dist-build-emscripten:
+ @BUILD_DIST=TRUE $(MAKE) emscripten
+
+dist-package-linux:
+ $(MAKE_DIST) package linux
dist-package-win32:
dist-package-win32:
- $(MAKE_DIST) package win
+ $(MAKE_DIST) package win
32
-dist-package-macosx:
+dist-package-win64:
+ $(MAKE_DIST) package win64
+
+dist-package-mac:
$(MAKE_DIST) package mac
dist-package-android:
$(MAKE_DIST) package android
$(MAKE_DIST) package mac
dist-package-android:
$(MAKE_DIST) package android
-dist-copy-package-
uni
x:
- $(MAKE_DIST) copy-package
uni
x
+dist-copy-package-
linu
x:
+ $(MAKE_DIST) copy-package
linu
x
dist-copy-package-win32:
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-mac
osx
:
+dist-copy-package-mac:
$(MAKE_DIST) copy-package mac
dist-copy-package-android:
$(MAKE_DIST) copy-package android
$(MAKE_DIST) copy-package mac
dist-copy-package-android:
$(MAKE_DIST) copy-package android
-dist-upload-
uni
x:
- $(MAKE_DIST) upload
uni
x
+dist-upload-
linu
x:
+ $(MAKE_DIST) upload
linu
x
dist-upload-win32:
dist-upload-win32:
- $(MAKE_DIST) upload win
+ $(MAKE_DIST) upload win32
+
+dist-upload-win64:
+ $(MAKE_DIST) upload win64
-dist-upload-mac
osx
:
+dist-upload-mac:
$(MAKE_DIST) upload mac
dist-upload-android:
$(MAKE_DIST) upload android
dist-package-all:
$(MAKE_DIST) upload mac
dist-upload-android:
$(MAKE_DIST) upload android
dist-package-all:
- $(MAKE) dist-package-
uni
x
+ $(MAKE) dist-package-
linu
x
$(MAKE) dist-package-win32
$(MAKE) dist-package-win32
- $(MAKE) dist-package-macosx
+ $(MAKE) dist-package-win64
+ $(MAKE) dist-package-mac
$(MAKE) dist-package-android
dist-copy-package-all:
$(MAKE) dist-package-android
dist-copy-package-all:
- $(MAKE) dist-copy-package-
uni
x
+ $(MAKE) dist-copy-package-
linu
x
$(MAKE) dist-copy-package-win32
$(MAKE) dist-copy-package-win32
- $(MAKE) dist-copy-package-macosx
+ $(MAKE) dist-copy-package-win64
+ $(MAKE) dist-copy-package-mac
$(MAKE) dist-copy-package-android
dist-upload-all:
$(MAKE) dist-copy-package-android
dist-upload-all:
- $(MAKE) dist-upload-
uni
x
+ $(MAKE) dist-upload-
linu
x
$(MAKE) dist-upload-win32
$(MAKE) dist-upload-win32
- $(MAKE) dist-upload-macosx
+ $(MAKE) dist-upload-win64
+ $(MAKE) dist-upload-mac
$(MAKE) dist-upload-android
dist-release-all: dist-package-all dist-copy-package-all dist-upload-all
$(MAKE) dist-upload-android
dist-release-all: dist-package-all dist-copy-package-all dist-upload-all