projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced preprocessor constants with enum values
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index da2806bb2a3496aa1d4b7c8dcfdcfa55882b1f01..0c195c0c65eca673a680d9900ab323a860508675 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-58,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
@@
-107,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