projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7ec00ca
)
removed obsolete targets and statements from Makefiles
author
Holger Schemel
<info@artsoft.org>
Tue, 14 Jul 2020 18:12:13 +0000
(20:12 +0200)
committer
Holger Schemel
<info@artsoft.org>
Tue, 14 Jul 2020 18:13:26 +0000
(20:13 +0200)
Makefile
patch
|
blob
|
history
src/Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 8921819891e9c82403ee3783ffa9532df6ca810b..cd68f28a454912e3d1998e9c8711b5e62729bc9b 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-63,15
+63,6
@@
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
diff --git
a/src/Makefile
b/src/Makefile
index b3a18b5e8376783f38f370f7d6a6201ae2cdd656..da479a447fabfb9b51eac29568089292ee5817eb 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-48,11
+48,6
@@
EDITION ?= default
# configuring platform
# -----------------------------------------------------------------------------
# configuring platform
# -----------------------------------------------------------------------------
-ifeq ($(PLATFORM),macosx) # compiling on Mac OS X
-EXTRA_LDFLAGS = -lstdc++
-override PLATFORM = unix
-endif
-
ifeq ($(PLATFORM),unix) # compiling on Unix/Linux (generic)
PROFILING_FLAGS = -pg
endif
ifeq ($(PLATFORM),unix) # compiling on Unix/Linux (generic)
PROFILING_FLAGS = -pg
endif
@@
-78,10
+73,6
@@
endif
# $(info Using SDL version $(SDL_VERSION) [TARGET == $(TARGET)])
# $(info Using SDL version $(SDL_VERSION) [TARGET == $(TARGET)])
-ifeq ($(TARGET),sdl) # compiling for SDL target
- $(error SDL library version 1.2 not supported anymore)
-endif
-
ifeq ($(TARGET),sdl2) # compiling for SDL2 target
SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags)
SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net
ifeq ($(TARGET),sdl2) # compiling for SDL2 target
SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags)
SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net