projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 3269ec511fb22024e3707d44f0496ddd932cc87a..f4f503fc9cf2555e6242422fe1ab605f6af7a198 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-108,6
+108,10
@@
OPTIONS = $(DEBUG) -O3 -Wall # only for debugging purposes
# OPTIONS = -O3
# OPTIONS = -DSYSV -Ae # may be needed for HP-UX
# OPTIONS = -O3
# OPTIONS = -DSYSV -Ae # may be needed for HP-UX
+ifdef BUILD_DIST # distribution build
+OPTIONS = -O3 -Wall
+endif
+
CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
@@
-150,13
+154,15
@@
ICON = $(ICONBASE).o
endif
endif
-all: $(PROGNAME)
+all:
libgame_dir
$(PROGNAME)
$(PROGNAME): $(LIBGAME) $(OBJS) $(ICON)
$(CC) $(PROFILING) $(OBJS) $(ICON) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
$(PROGNAME): $(LIBGAME) $(OBJS) $(ICON)
$(CC) $(PROFILING) $(OBJS) $(ICON) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
+libgame_dir:
+ @$(MAKE) -C $(LIBDIR)
$(LIBGAME):
$(LIBGAME):
- $(MAKE) -C $(LIBDIR)
+
@
$(MAKE) -C $(LIBDIR)
$(ICON):
$(BMP2ICO) -transparent $(ICONBASE).ico $(ICON32X32)
$(ICON):
$(BMP2ICO) -transparent $(ICONBASE).ico $(ICON32X32)