summaryrefslogtreecommitdiff
path: root/3rdparty
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-07-18 15:42:53 +0200
committerHaru <haru@dotalux.com>2013-07-21 20:26:46 +0200
commitd627f8f3cdebc07dfc54e762456f477806f0b3cb (patch)
tree5c5fa31945e2861d256d4bab2dbc2bf0372aa789 /3rdparty
parent2548a8cee42fae1225cd9ff3266beb4feb13dc83 (diff)
downloadhercules-d627f8f3cdebc07dfc54e762456f477806f0b3cb.tar.gz
hercules-d627f8f3cdebc07dfc54e762456f477806f0b3cb.tar.bz2
hercules-d627f8f3cdebc07dfc54e762456f477806f0b3cb.tar.xz
hercules-d627f8f3cdebc07dfc54e762456f477806f0b3cb.zip
Changed CC to a Makefile variable
- This allows the user to override the compiler at each make invocation (i.e. to run scripts to generate .clang_complete for https://github.com/Rip-Rip/clang_complete ) - Updated .gitignore with a few platform-dependent entries Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/libconfig/Makefile.in5
-rw-r--r--3rdparty/mt19937ar/Makefile.in5
2 files changed, 8 insertions, 2 deletions
diff --git a/3rdparty/libconfig/Makefile.in b/3rdparty/libconfig/Makefile.in
index ee17298b4..f3c6e986d 100644
--- a/3rdparty/libconfig/Makefile.in
+++ b/3rdparty/libconfig/Makefile.in
@@ -4,6 +4,9 @@ LIBCONFIG_H = libconfig.h grammar.h parsectx.h scanctx.h scanner.h strbuf.h winc
@SET_MAKE@
+CC = @CC@
+export CC
+
#####################################################################
.PHONY : all clean help
@@ -23,4 +26,4 @@ help:
%.o: %.c $(LIBCONFIG_H)
@echo " CC $<"
- @@CC@ @CFLAGS@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @$(CC) @CFLAGS@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
diff --git a/3rdparty/mt19937ar/Makefile.in b/3rdparty/mt19937ar/Makefile.in
index 8a7b64669..b899c413f 100644
--- a/3rdparty/mt19937ar/Makefile.in
+++ b/3rdparty/mt19937ar/Makefile.in
@@ -4,6 +4,9 @@ MT19937AR_H = mt19937ar.h
@SET_MAKE@
+CC = @CC@
+export CC
+
#####################################################################
.PHONY : all clean help
@@ -23,4 +26,4 @@ help:
%.o: %.c $(MT19937AR_H)
@echo " CC $<"
- @@CC@ @CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @$(CC) @CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<