projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed functions for correcting playfield buffer position for EM engine
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index f33c2e86e13cef0567994089ea4f3b8179034fb7..e42d5370f7c73fb0b4170e001fe3a45b4d48cd72 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-32,6
+32,8
@@
CONVERT_ICON_ARGS = -transparent black -background transparent
PROGBASE = rocksndiamonds
PROGNAME = ../$(PROGBASE)
PROGBASE = rocksndiamonds
PROGNAME = ../$(PROGBASE)
+EDITION ?= default
+
# -----------------------------------------------------------------------------
# configuring platform
# -----------------------------------------------------------------------------
# configuring platform
@@
-56,26
+58,19
@@
endif
# configuring target
# -----------------------------------------------------------------------------
# configuring target
# -----------------------------------------------------------------------------
-ifndef TARGET # auto-detect compiling for SDL
or SDL
2
+ifndef TARGET # auto-detect compiling for SDL2
SDL_VERSION := $(shell sdl2-config --version 2> /dev/null)
ifdef SDL_VERSION
TARGET = sdl2
else
SDL_VERSION := $(shell sdl2-config --version 2> /dev/null)
ifdef SDL_VERSION
TARGET = sdl2
else
- SDL_VERSION := $(shell sdl-config --version 2> /dev/null)
- ifdef SDL_VERSION
- TARGET = sdl
- else
- $(error SDL/SDL2 library not found)
- endif
+ $(error SDL2 library not found)
endif
endif
# $(info Using SDL version $(SDL_VERSION) [TARGET == $(TARGET)])
ifeq ($(TARGET),sdl) # compiling for SDL target
endif
endif
# $(info Using SDL version $(SDL_VERSION) [TARGET == $(TARGET)])
ifeq ($(TARGET),sdl) # compiling for SDL target
-SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
-SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
+ $(error SDL library version 1.2 not supported anymore)
endif
ifeq ($(TARGET),sdl2) # compiling for SDL2 target
endif
ifeq ($(TARGET),sdl2) # compiling for SDL2 target
@@
-105,7
+100,8
@@
DEBUG = -DDEBUG -g
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
# OPTIONS = $(DEBUG) -O3 -Wall # only for debugging purposes
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
# OPTIONS = $(DEBUG) -O3 -Wall # only for debugging purposes
-OPTIONS = $(DEBUG) -Wall # only for debugging purposes
+# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
+OPTIONS = $(DEBUG) -Wall -Wstrict-prototypes -Wmissing-prototypes
# OPTIONS = $(DEBUG) -Wall -ansi -pedantic # only for debugging purposes
# OPTIONS = -O3 -Wall -ansi -pedantic
# OPTIONS = -O3 -Wall
# OPTIONS = $(DEBUG) -Wall -ansi -pedantic # only for debugging purposes
# OPTIONS = -O3 -Wall -ansi -pedantic
# OPTIONS = -O3 -Wall
@@
-118,7
+114,7
@@
OPTIONS = -O3 -Wall
endif
CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG)
endif
CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG)
-LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
-lz
SRCS = main.c \
SRCS = main.c \
@@
-205,7
+201,7
@@
ICONBASE = windows_icon
ICON_BASEPATH = ../Special/Icons/windows_icons
ifeq ($(PLATFORM),cross-win32)
ICON_BASEPATH = ../Special/Icons/windows_icons
ifeq ($(PLATFORM),cross-win32)
-ICON_PATH = $(ICON_BASEPATH)/
default
+ICON_PATH = $(ICON_BASEPATH)/
$(EDITION)
ICON = $(ICONBASE).o
endif
ICON = $(ICONBASE).o
endif