projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added functions for setting and getting screen borders for gadgets
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index ec8cb5e9224ae2eb74b8124dd5da4d1a472f0dd5..b7289d01ddc7a8492dd83ef6729d2956120c35df 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-44,8
+44,6
@@
DEBUGGER = gdb -batch -ex "run" -ex "bt"
PROGBASE = rocksndiamonds
PROGNAME = ../$(PROGBASE)
PROGBASE = rocksndiamonds
PROGNAME = ../$(PROGBASE)
-EDITION ?= default
-
# -----------------------------------------------------------------------------
# configuring platform
# -----------------------------------------------------------------------------
# configuring platform
@@
-82,6
+80,11
@@
MACOSX_DEPLOYMENT_TARGET = $MAC_TARGET_VERSION_MIN
endif
endif
endif
endif
+ifeq ($(shell uname -s),OS/2) # compiling on OS/2
+PROGNAME = ../$(PROGBASE).exe
+EXTRA_LDFLAGS = -Zomf -Zbin-files -Zmap -lcx -Zhigh-mem
+endif
+
# -----------------------------------------------------------------------------
# configuring target
# -----------------------------------------------------------------------------
# configuring target
@@
-134,6
+137,7
@@
DEBUG = -DDEBUG -g
# OPTIONS = $(DEBUG) -O2 -Wall # only for debugging purposes
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
OPTIONS = $(DEBUG) -Wall -Wstrict-prototypes -Wmissing-prototypes
# OPTIONS = $(DEBUG) -O2 -Wall # only for debugging purposes
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
OPTIONS = $(DEBUG) -Wall -Wstrict-prototypes -Wmissing-prototypes
+# OPTIONS = $(DEBUG) -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes
# OPTIONS = $(DEBUG) -Wall -ansi -pedantic # only for debugging purposes
# OPTIONS = -O2 -Wall -ansi -pedantic
# OPTIONS = -O2 -Wall
# OPTIONS = $(DEBUG) -Wall -ansi -pedantic # only for debugging purposes
# OPTIONS = -O2 -Wall -ansi -pedantic
# OPTIONS = -O2 -Wall
@@
-244,10
+248,10
@@
RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP) $(GAME_MM)
AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
ICONBASE = windows_icon
AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
ICONBASE = windows_icon
-ICON_BASEPATH = ../
Special/Icons/windows_
icons
+ICON_BASEPATH = ../
build-projects/windows/
icons
ifeq ($(PLATFORM_BASE),cross-win)
ifeq ($(PLATFORM_BASE),cross-win)
-ICON_PATH = $(ICON_BASEPATH)
/$(EDITION)
+ICON_PATH = $(ICON_BASEPATH)
ICON = $(ICONBASE).o
endif
ICON = $(ICONBASE).o
endif
@@
-327,7
+331,6
@@
$(COMMIT_HASH_FILE): $(SRCS) $(RNDLIBS)
@$(MAKE) conf-hash
$(ICON):
@$(MAKE) conf-hash
$(ICON):
-# $(CONVERT) $(ICON32X32) $(CONVERT_ICON_ARGS) $(ICONBASE).ico
$(CONVERT) $(ICON_PATH)/*.png $(CONVERT_ICON_ARGS) $(ICONBASE).ico
echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
$(CONVERT) $(ICON_PATH)/*.png $(CONVERT_ICON_ARGS) $(ICONBASE).ico
echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)