Quellcode durchsuchen

update

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@580 54d463be-8e91-2dee-dedb-b68131a5f0ec
amber vor 20 Jahren
Ursprung
Commit
98ef85a7f7
2 geänderte Dateien mit 5 neuen und 3 gelöschten Zeilen
  1. 2 0
      Changelog.txt
  2. 3 3
      Makefile

+ 2 - 0
Changelog.txt

@@ -1,5 +1,7 @@
 Date	Added
 12/16
+	* Fixed a misuse of mysql_config (thanks Daegalus for
+	  creating a reproducable environment for me)   [MouseJstr]
 	* Fixed compile time errors for gcc 2.95 [MouseJstr]
 	* Added #itemlist, removed @charitemlist [MC Cameri]
 	* Changed @job and #job so that when it's used it unequips all the items, to prevent sprite errors [MC Cameri]

+ 3 - 3
Makefile

@@ -34,10 +34,10 @@ ifeq ($(findstring /,$(MYSQLFLAG_CONFIG)), /)
 MYSQLFLAG_VERSION = $(shell $(MYSQLFLAG_CONFIG) --version | sed s:\\..*::) 
 endif
 
-ifeq ($(findstring 5,$(MYSQLFLAG_VERSION)), 5)
-MYSQLFLAG_CONFIG_ARGUMENT = --include
-endif
 ifeq ($(findstring 4,$(MYSQLFLAG_VERSION)), 4)
+MYSQLFLAG_CONFIG_ARGUMENT = --cflags
+endif
+ifeq ($(findstring 5,$(MYSQLFLAG_VERSION)), 5)
 MYSQLFLAG_CONFIG_ARGUMENT = --include
 endif
 ifndef MYSQLFLAG_CONFIG_ARGUMENT