projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added loading high scores from score server
[rocksndiamonds.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 308f0c9523513a0b9ea7f5c36569b6b28e9a1863..ae6b318d4c73c45706a88eb7d617e335fed18045 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
# =============================================================================
@@
-80,6
+80,9
@@
android-clean:
android: android-package
android: android-package
+emscripten:
+ @emmake $(MAKE_CMD) PLATFORM=emscripten
+
clean:
@$(MAKE_CMD) clean
clean:
@$(MAKE_CMD) clean
@@
-102,6
+105,9
@@
auto-conf:
conf-time:
@$(MAKE_CMD) conf-time
conf-time:
@$(MAKE_CMD) conf-time
+conf-hash:
+ @$(MAKE_CMD) conf-hash
+
run: all
@$(MAKE_CMD) run
run: all
@$(MAKE_CMD) run
@@
-148,7
+154,7
@@
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)
dist-build-win32:
@@
-157,14
+163,17
@@
dist-build-win32:
dist-build-win64:
@BUILD_DIST=TRUE $(MAKE) cross-win64
dist-build-win64:
@BUILD_DIST=TRUE $(MAKE) cross-win64
-dist-build-mac
osx
:
+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:
$(MAKE_DIST) package win32
dist-package-win32:
$(MAKE_DIST) package win32
@@
-172,14
+181,17
@@
dist-package-win32:
dist-package-win64:
$(MAKE_DIST) package win64
dist-package-win64:
$(MAKE_DIST) package win64
-dist-package-mac
osx
:
+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-unix:
- $(MAKE_DIST) copy-package unix
+dist-package-emscripten:
+ $(MAKE_DIST) package emscripten
+
+dist-copy-package-linux:
+ $(MAKE_DIST) copy-package linux
dist-copy-package-win32:
$(MAKE_DIST) copy-package win32
dist-copy-package-win32:
$(MAKE_DIST) copy-package win32
@@
-187,14
+199,17
@@
dist-copy-package-win32:
dist-copy-package-win64:
$(MAKE_DIST) copy-package win64
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-unix:
- $(MAKE_DIST) upload unix
+dist-copy-package-emscripten:
+ $(MAKE_DIST) copy-package emscripten
+
+dist-upload-linux:
+ $(MAKE_DIST) upload linux
dist-upload-win32:
$(MAKE_DIST) upload win32
dist-upload-win32:
$(MAKE_DIST) upload win32
@@
-202,32
+217,44
@@
dist-upload-win32:
dist-upload-win64:
$(MAKE_DIST) upload win64
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
$(MAKE_DIST) upload mac
dist-upload-android:
$(MAKE_DIST) upload android
+dist-upload-emscripten:
+ $(MAKE_DIST) upload emscripten
+
+dist-deploy-emscripten:
+ $(MAKE_DIST) deploy emscripten
+
dist-package-all:
dist-package-all:
- $(MAKE) dist-package-
uni
x
+ $(MAKE) dist-package-
linu
x
$(MAKE) dist-package-win32
$(MAKE) dist-package-win64
$(MAKE) dist-package-win32
$(MAKE) dist-package-win64
- $(MAKE) dist-package-mac
osx
+ $(MAKE) dist-package-mac
$(MAKE) dist-package-android
$(MAKE) dist-package-android
+ $(MAKE) dist-package-emscripten
dist-copy-package-all:
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-win64
$(MAKE) dist-copy-package-win32
$(MAKE) dist-copy-package-win64
- $(MAKE) dist-copy-package-mac
osx
+ $(MAKE) dist-copy-package-mac
$(MAKE) dist-copy-package-android
$(MAKE) dist-copy-package-android
+ $(MAKE) dist-copy-package-emscripten
dist-upload-all:
dist-upload-all:
- $(MAKE) dist-upload-
uni
x
+ $(MAKE) dist-upload-
linu
x
$(MAKE) dist-upload-win32
$(MAKE) dist-upload-win64
$(MAKE) dist-upload-win32
$(MAKE) dist-upload-win64
- $(MAKE) dist-upload-mac
osx
+ $(MAKE) dist-upload-mac
$(MAKE) dist-upload-android
$(MAKE) dist-upload-android
+ $(MAKE) dist-upload-emscripten
+
+dist-deploy-all:
+ $(MAKE) dist-deploy-emscripten
dist-release-all: dist-package-all dist-copy-package-all dist-upload-all
dist-release-all: dist-package-all dist-copy-package-all dist-upload-all
@@
-237,4
+264,6
@@
copy-package-all: dist-copy-package-all
upload-all: dist-upload-all
upload-all: dist-upload-all
+deploy-all: dist-deploy-all
+
release-all: dist-release-all
release-all: dist-release-all