diff options
| author | Neil Moore <neil@s-z.org> | 2014-07-12 21:29:54 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-07-12 21:32:44 -0400 |
| commit | b125e2f67eaf4c0d8837fbcd4833359ac00443a2 (patch) | |
| tree | faf247230302f2cf751efcb6c438cba3f1414b46 /crawl-ref/source/Makefile | |
| parent | 3d5dc734227ba4b2309639e6575eb55e657ecb82 (diff) | |
| download | crawl-ref-b125e2f67eaf4c0d8837fbcd4833359ac00443a2.tar.gz crawl-ref-b125e2f67eaf4c0d8837fbcd4833359ac00443a2.zip | |
Only use the contrib lib and include directory if building contribs.
At least some linkers complain about nonexistent -L directories.
Diffstat (limited to 'crawl-ref/source/Makefile')
| -rw-r--r-- | crawl-ref/source/Makefile | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index cb4d62234c..f2465b214e 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -373,9 +373,6 @@ SAVEDIR := ~/.crawl endif -INCLUDES_L += -isystem contrib/install/$(ARCH)/include -LIBS += -Lcontrib/install/$(ARCH)/lib - INCLUDES_L += -Iutil -I. ifdef APPLE_GCC @@ -1005,15 +1002,6 @@ ifdef REPORT CFOTHERS += -ftime-report endif -ifdef ANDROID -CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS) -else -CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) -endif -CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L) -ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L) -YACC_CFLAGS := $(ALL_CFLAGS) -Wno-unused-function -Wno-sign-compare -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 - UTIL = util/ EXTRA_OBJECTS += $(YACC_OBJECTS) @@ -1111,8 +1099,24 @@ endif EXTRA_OBJECTS += version.o +ifdef CONTRIBS +INCLUDES_L += -isystem contrib/install/$(ARCH)/include +LIBS += -Lcontrib/install/$(ARCH)/lib +endif + LIBS += $(CONTRIB_LIBS) $(EXTRA_LIBS) + +ifdef ANDROID +CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS) +else +CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) +endif +CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L) +ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L) +YACC_CFLAGS := $(ALL_CFLAGS) -Wno-unused-function -Wno-sign-compare -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 + + DOC_BASE := ../docs DOC_TEMPLATES := $(DOC_BASE)/template GENERATED_DOCS := $(DOC_BASE)/aptitudes.txt $(DOC_BASE)/FAQ.html $(DOC_BASE)/crawl_manual.txt |