projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20140103-1-src
[rocksndiamonds.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index b2d8476cd80dbc66d9193cbdc80a685c80bfce99..00e7695b304c300c432e5e4d28fdd875c44125fc 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-59,7
+59,7
@@
SRC_DIR = src
MAKE_CMD = $(MAKE) -C $(SRC_DIR)
# DEFAULT_TARGET = x11
MAKE_CMD = $(MAKE) -C $(SRC_DIR)
# DEFAULT_TARGET = x11
-DEFAULT_TARGET = sdl
+DEFAULT_TARGET = sdl
2
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
@@
-75,6
+75,9
@@
x11:
sdl:
@$(MAKE_CMD) TARGET=sdl
sdl:
@$(MAKE_CMD) TARGET=sdl
+sdl2:
+ @$(MAKE_CMD) TARGET=sdl2
+
solaris:
@$(MAKE_CMD) PLATFORM=solaris TARGET=x11
solaris:
@$(MAKE_CMD) PLATFORM=solaris TARGET=x11
@@
-87,6
+90,9
@@
mac:
mac-static:
@$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
mac-static:
@$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
+mac2-static:
+ @$(MAKE_CMD) PLATFORM=macosx TARGET=sdl2-static
+
msdos:
@$(MAKE_CMD) PLATFORM=msdos
msdos:
@$(MAKE_CMD) PLATFORM=msdos
@@
-143,7
+149,7
@@
backup:
backup-net-copy:
./Scripts/make_backup.sh src scp
backup-net-copy:
./Scripts/make_backup.sh src scp
-backup-
net
: backup backup-net-copy
+backup-
all
: backup backup-net-copy
backup_lev:
./Scripts/make_backup.sh lev
backup_lev:
./Scripts/make_backup.sh lev
@@
-164,7
+170,7
@@
dist-clean:
@$(MAKE_CMD) dist-clean
dist-build-unix:
@$(MAKE_CMD) dist-clean
dist-build-unix:
- @BUILD_DIST=TRUE $(MAKE)
x11
+ @BUILD_DIST=TRUE $(MAKE)
dist-build-msdos:
@BUILD_DIST=TRUE $(MAKE) cross-msdos
dist-build-msdos:
@BUILD_DIST=TRUE $(MAKE) cross-msdos
@@
-173,10
+179,10
@@
dist-build-win32:
@BUILD_DIST=TRUE $(MAKE) cross-win32
dist-build-macosx:
@BUILD_DIST=TRUE $(MAKE) cross-win32
dist-build-macosx:
-
#
(this is done by "dist-package-macosx" target)
+
#
(this is done by "dist-package-macosx" target)
dist-build-macosx-ppc:
dist-build-macosx-ppc:
-
#
(this is done by "dist-package-macosx-ppc" target)
+
#
(this is done by "dist-package-macosx-ppc" target)
dist-package-unix:
./Scripts/make_dist.sh unix .
dist-package-unix:
./Scripts/make_dist.sh unix .
@@
-236,4
+242,4
@@
tags:
$(MAKE_CMD) tags
depend dep:
$(MAKE_CMD) tags
depend dep:
- $(MAKE_CMD) depend
+ $(MAKE_CMD)
TARGET=$(DEFAULT_TARGET)
depend