projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed time of some game elements when reading native DC2 levels
[rocksndiamonds.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index cd68f28a454912e3d1998e9c8711b5e62729bc9b..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
# =============================================================================
@@
-69,23
+69,20
@@
cross-win32:
cross-win64:
@PATH=$(CROSS_PATH_WIN64)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win64
cross-win64:
@PATH=$(CROSS_PATH_WIN64)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win64
-android-
compil
e:
- @$(MAKE_CMD_ANDROID)
compil
e
+android-
prepar
e:
+ @$(MAKE_CMD_ANDROID)
prepar
e
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
@@
-105,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
@@
-151,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:
@@
-160,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
@@
-175,14
+181,14
@@
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-
uni
x:
- $(MAKE_DIST) copy-package
uni
x
+dist-copy-package-
linu
x:
+ $(MAKE_DIST) copy-package
linu
x
dist-copy-package-win32:
$(MAKE_DIST) copy-package win32
dist-copy-package-win32:
$(MAKE_DIST) copy-package win32
@@
-190,14
+196,14
@@
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-
uni
x:
- $(MAKE_DIST) upload
uni
x
+dist-upload-
linu
x:
+ $(MAKE_DIST) upload
linu
x
dist-upload-win32:
$(MAKE_DIST) upload win32
dist-upload-win32:
$(MAKE_DIST) upload win32
@@
-205,31
+211,31
@@
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
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-win64
$(MAKE) dist-package-win32
$(MAKE) dist-package-win64
- $(MAKE) dist-package-mac
osx
+ $(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-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
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-win64
$(MAKE) dist-upload-win32
$(MAKE) dist-upload-win64
- $(MAKE) dist-upload-mac
osx
+ $(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