X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=aae58256af7f11fa73a5fa51aee3da7409d918a8;hb=2e99b0c26d334eb287486b8933b52b5048c6cc0c;hp=b2d8476cd80dbc66d9193cbdc80a685c80bfce99;hpb=c91aa2b237bef6003ead8dfc98cdcab89f97c654;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index b2d8476c..aae58256 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,6 @@ CC = gcc
 # (this must be set to "gmake" for some systems)
 MAKE = make
 
-# path to X11 on your system
-X11_PATH = /usr/X11R6
-
 # directory for read-only game data (like graphics, sounds, levels)
 # default is '.' to be able to run program without installation
 # RO_GAME_DIR = /usr/games
@@ -41,8 +38,7 @@ X11_PATH = /usr/X11R6
 # uncomment to install game in single-user environment (default)
 # SCORE_ENTRIES = MANY_PER_NAME
 
-# paths for cross-compiling (only needed for non-native MS-DOS and Win32 build)
-CROSS_PATH_MSDOS = /usr/local/cross-msdos/i386-msdosdjgpp
+# path for cross-compiling (only needed for non-native Windows build)
 CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
 
 # compile special edition of R'n'D instead of the normal (classic) version
@@ -58,8 +54,7 @@ CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-# DEFAULT_TARGET = x11
-DEFAULT_TARGET = sdl
+DEFAULT_TARGET = sdl2
 
 
 # -----------------------------------------------------------------------------
@@ -69,17 +64,11 @@ DEFAULT_TARGET = sdl
 all:
 	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
 
-x11:
-	@$(MAKE_CMD) TARGET=x11
-
 sdl:
 	@$(MAKE_CMD) TARGET=sdl
 
-solaris:
-	@$(MAKE_CMD) PLATFORM=solaris TARGET=x11
-
-solaris-sdl:
-	@$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
+sdl2:
+	@$(MAKE_CMD) TARGET=sdl2
 
 mac:
 	@$(MAKE_CMD) PLATFORM=macosx
@@ -87,15 +76,12 @@ mac:
 mac-static:
 	@$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
 
-msdos:
-	@$(MAKE_CMD) PLATFORM=msdos
+mac2-static:
+	@$(MAKE_CMD) PLATFORM=macosx TARGET=sdl2-static
 
 os2:
 	@$(MAKE_CMD) PLATFORM=os2
 
-cross-msdos:
-	@PATH=$(CROSS_PATH_MSDOS)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-msdos
-
 cross-win32:
 	@PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
 
@@ -143,7 +129,7 @@ backup:
 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
@@ -164,26 +150,20 @@ dist-clean:
 	@$(MAKE_CMD) dist-clean
 
 dist-build-unix:
-	@BUILD_DIST=TRUE $(MAKE) x11
-
-dist-build-msdos:
-	@BUILD_DIST=TRUE $(MAKE) cross-msdos
+	@BUILD_DIST=TRUE $(MAKE)
 
 dist-build-win32:
 	@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:
-	# (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-msdos:
-	./Scripts/make_dist.sh dos .
-
 dist-package-win32:
 	./Scripts/make_dist.sh win .
 
@@ -196,9 +176,6 @@ dist-package-macosx-ppc:
 dist-upload-unix:
 	./Scripts/make_dist.sh unix . upload
 
-dist-upload-msdos:
-	./Scripts/make_dist.sh dos . upload
-
 dist-upload-win32:
 	./Scripts/make_dist.sh win . upload
 
@@ -212,21 +189,18 @@ dist-build-all:
 	$(MAKE) clean
 	$(MAKE) dist-build-unix		; $(MAKE) dist-clean
 	$(MAKE) dist-build-win32	; $(MAKE) dist-clean
-#	$(MAKE) dist-build-msdos	; $(MAKE) dist-clean
 
 dist-package-all:
 	$(MAKE) dist-package-unix
 	$(MAKE) dist-package-win32
 	$(MAKE) dist-package-macosx
 	$(MAKE) dist-package-macosx-ppc
-#	$(MAKE) dist-package-msdos
 
 dist-upload-all:
 	$(MAKE) dist-upload-unix
 	$(MAKE) dist-upload-win32
 	$(MAKE) dist-upload-macosx
 	$(MAKE) dist-upload-macosx-ppc
-#	$(MAKE) dist-upload-msdos
 
 dist-all: dist-build-all dist-package-all
 
@@ -236,4 +210,4 @@ tags:
 	$(MAKE_CMD) tags
 
 depend dep:
-	$(MAKE_CMD) depend
+	$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) depend