diff options
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/char/Makefile.in | 2 | ||||
| -rw-r--r-- | src/char_sql/Makefile.in | 2 | ||||
| -rw-r--r-- | src/common/Makefile.in | 6 | ||||
| -rw-r--r-- | src/ladmin/Makefile.in | 2 | ||||
| -rw-r--r-- | src/login/Makefile.in | 2 | ||||
| -rw-r--r-- | src/login_sql/Makefile.in | 2 | ||||
| -rw-r--r-- | src/map/Makefile.in | 4 | ||||
| -rw-r--r-- | src/plugins/Makefile.in | 2 |
9 files changed, 15 insertions, 11 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c928ed2fd..9bf6640bc 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,10 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2007/02/22 + * Added $(CUSTOM_CFLAGS) into all Makefile.in to provide any custom defs + directly to all sub make files. How to use: + make CUSTOM_CFLAGS='-DSOME_DEF' sql [Lupus] 2007/02/21 * Added status_calc_life to properly calculate hp/max_hp as a ratio taking into accounts overflows (and for now also avoids divisions by 0). Applied diff --git a/src/char/Makefile.in b/src/char/Makefile.in index 359e19b01..37b464991 100644 --- a/src/char/Makefile.in +++ b/src/char/Makefile.in @@ -40,7 +40,7 @@ obj_txt: -mkdir obj_txt obj_txt/%.o: %.c $(CHAR_H) $(COMMON_H) - @CC@ @CFLAGS@ -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files ../common/obj_all/%.o: diff --git a/src/char_sql/Makefile.in b/src/char_sql/Makefile.in index 819ddec18..8a422dcf7 100644 --- a/src/char_sql/Makefile.in +++ b/src/char_sql/Makefile.in @@ -54,7 +54,7 @@ obj_sql: -mkdir obj_sql obj_sql/%.o: %.c $(CHAR_H) $(COMMON_H) $(COMMON_SQL_H) - @CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files ../common/obj_all/%.o: diff --git a/src/common/Makefile.in b/src/common/Makefile.in index bda9e1911..75450f46a 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -60,13 +60,13 @@ common_sql: obj_sql $(COMMON_SQL_OBJ) obj_all/%.o: %.c $(COMMON_H) - @CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj_all/mini%.o: %.c $(COMMON_H) - @CC@ @CFLAGS@ -DMINICORE @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DMINICORE @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj_sql/%.o: %.c $(COMMON_H) $(COMMON_SQL_H) - @CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< HAVESVN = $(shell which svnversion) diff --git a/src/ladmin/Makefile.in b/src/ladmin/Makefile.in index 4703dded1..365252f63 100644 --- a/src/ladmin/Makefile.in +++ b/src/ladmin/Makefile.in @@ -35,7 +35,7 @@ obj_all: -mkdir obj_all obj_all/%.o: %.c $(LADMIN_H) $(COMMON_H) - @CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files ../common/obj_all/%.o: diff --git a/src/login/Makefile.in b/src/login/Makefile.in index 0c194fac4..aeb41b667 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -39,7 +39,7 @@ obj_txt: -mkdir obj_txt obj_txt/%.o: %.c $(LOGIN_H) $(COMMON_H) - @CC@ @CFLAGS@ -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files ../common/obj_all/%.o: diff --git a/src/login_sql/Makefile.in b/src/login_sql/Makefile.in index 72d23b183..05bd9262e 100644 --- a/src/login_sql/Makefile.in +++ b/src/login_sql/Makefile.in @@ -50,7 +50,7 @@ obj_sql: -mkdir obj_sql obj_sql/%.o: %.c $(LOGIN_H) $(COMMON_H) - @CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files ../common/obj_all/%.o: diff --git a/src/map/Makefile.in b/src/map/Makefile.in index 4276b976a..7799b43ce 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -90,10 +90,10 @@ map-server_sql: obj_sql $(MAP_SQL_OBJ) $(COMMON_OBJ) $(COMMON_SQL_OBJ) # map object files obj_txt/%.o: %.c $(MAP_H) $(COMMON_H) - @CC@ @CFLAGS@ $(PCRE_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @CC@ @CFLAGS@ $(PCRE_CFLAGS) $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj_sql/%.o: %.c $(MAP_H) $(COMMON_H) $(COMMON_SQL_H) - @CC@ @CFLAGS@ $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @CC@ @CFLAGS@ $(PCRE_CFLAGS) $(CUSTOM_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files ../common/obj_all/%.o: diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index c21bcd7d9..6a902e1d7 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -50,7 +50,7 @@ gui@DLLEXT@: ../../plugins/gui.conf upnp@DLLEXT@: ../../plugins/upnp.conf sig@DLLEXT@: sig.c $(COMMON_OBJ) - @CC@ @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ -shared -o ../../plugins/$@ $< $(COMMON_OBJ) + @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @CPPFLAGS@ @LDFLAGS@ -shared -o ../../plugins/$@ $< $(COMMON_OBJ) ../../plugins/%.conf: %.txt cp -r $< $@ |