diff options
| author | Haru <haru@dotalux.com> | 2013-07-18 15:42:53 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-07-21 20:26:46 +0200 |
| commit | d627f8f3cdebc07dfc54e762456f477806f0b3cb (patch) | |
| tree | 5c5fa31945e2861d256d4bab2dbc2bf0372aa789 /src/map/Makefile.in | |
| parent | 2548a8cee42fae1225cd9ff3266beb4feb13dc83 (diff) | |
| download | hercules-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 'src/map/Makefile.in')
| -rw-r--r-- | src/map/Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/map/Makefile.in b/src/map/Makefile.in index d5e362e48..70c0cd900 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -48,6 +48,9 @@ endif @SET_MAKE@ +CC = @CC@ +export CC + ##################################################################### .PHONY : all txt sql clean help @@ -92,13 +95,13 @@ obj_sql: map-server: obj_sql $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a @echo " LD $@" - @@CC@ @LDFLAGS@ -o ../../map-server@EXEEXT@ $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@ + @$(CC) @LDFLAGS@ -o ../../map-server@EXEEXT@ $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@ # map object files obj_sql/%.o: %.c $(MAP_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @$(CC) @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files ../common/obj_all/common.a: |