diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-10-08 15:34:13 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-10-08 18:11:11 +0200 |
| commit | 3f6aab358f242d0981cc8fafb6cd61ae32948d06 (patch) | |
| tree | 3dee12fb1d8dbd5b16d56d3acac07ff76032a63a /crawl-ref/source/Makefile | |
| parent | 4fa33068a4e812ae36422af806e84416bd92b421 (diff) | |
| download | crawl-ref-3f6aab358f242d0981cc8fafb6cd61ae32948d06.tar.gz crawl-ref-3f6aab358f242d0981cc8fafb6cd61ae32948d06.zip | |
Move the pkg-config check earlier in the Makefile.
To fix some useless errors when compiling with windows.
Diffstat (limited to 'crawl-ref/source/Makefile')
| -rw-r--r-- | crawl-ref/source/Makefile | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index ddc47656c7..828d0179c3 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -539,6 +539,20 @@ CFOPTIMIZE += -march=native endif endif +# Okay, we have to assume we're on something else that +# uses standard UNIX-like methods for finding libs. +# +# For instance, on Linux and most other UNIX-likes, +# the app pkg-config can provide the appropriate +# CFLAGS and LDFLAGS. +# + +ifndef NO_PKGCONFIG +ifeq ($(shell which pkg-config 2> /dev/null),) +NO_PKGCONFIG = YesPlease +endif +endif + ifdef ANDROID BUILD_LUA= BUILD_SQLITE= @@ -629,20 +643,6 @@ ifdef GLES DEFINES_L += -DUSE_GLES endif -# Okay, we have to assume we're on something else that -# uses standard UNIX-like methods for finding libs. -# -# For instance, on Linux and most other UNIX-likes, -# the app pkg-config can provide the appropriate -# CFLAGS and LDFLAGS. -# - -ifndef NO_PKGCONFIG -ifeq ($(shell which pkg-config 2> /dev/null),) -NO_PKGCONFIG = YesPlease -endif -endif - ifndef NO_PKGCONFIG # If pkg-config is available, it's the surest way to find where |