diff options
| author | shennetsind <ind@henn.et> | 2013-07-21 15:58:01 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-07-21 15:58:01 -0300 |
| commit | dede3fb8bdfdbb8c49ebc7e9b5a0a2665033f8e8 (patch) | |
| tree | 9b90aeae8d8922479f34e0ae7ea1c4aa99f39365 /src/map | |
| parent | b2e12fbc71d2e5e1005c9daa386345a45105be03 (diff) | |
| parent | d627f8f3cdebc07dfc54e762456f477806f0b3cb (diff) | |
| download | hercules-dede3fb8bdfdbb8c49ebc7e9b5a0a2665033f8e8.tar.gz hercules-dede3fb8bdfdbb8c49ebc7e9b5a0a2665033f8e8.tar.bz2 hercules-dede3fb8bdfdbb8c49ebc7e9b5a0a2665033f8e8.tar.xz hercules-dede3fb8bdfdbb8c49ebc7e9b5a0a2665033f8e8.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map')
| -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: |