summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-29 21:16:45 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-29 21:16:45 +0000
commite76aeff95c38966a2402fc1d6cbe975f2ec535c2 (patch)
treeeeded77fb4655474ce799c595fc3d9d7f2d66eae
parent6fd1aaa92666b6097d6e480741490de28795a833 (diff)
downloadhercules-e76aeff95c38966a2402fc1d6cbe975f2ec535c2.tar.gz
hercules-e76aeff95c38966a2402fc1d6cbe975f2ec535c2.tar.bz2
hercules-e76aeff95c38966a2402fc1d6cbe975f2ec535c2.tar.xz
hercules-e76aeff95c38966a2402fc1d6cbe975f2ec535c2.zip
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@864 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt2
-rw-r--r--Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 61404e627..222c6a9aa 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,6 @@
Date Added
12/29
- * Fixing a crash if you change the name of a pet you don't have (SVN 862) [MouseJstr]
+ * Fixing a crash if you change the name of a pet you don't have (SVN 863) [MouseJstr]
* Eliminated src/common/malloc.c when not needed [MouseJstr]
* Some code cleanup in prep for new debugging malloc (SVN 861) [MouseJstr]
* Updated Soul Breaker's damage calculation [celest]
diff --git a/Makefile b/Makefile
index 527693e4e..e8f251ad4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,12 @@
CC = gcc -pipe
# CC = gcc -pipe -x c++
# CC = gcc -pipe -DGCOLLECT
+# CC = gcc -pipe -DDMALLOC -DDMALLOC_FUNC_CHECK
# CC = /usr/local/bin/gcc -fbounds-checking -pipe -DBCHECK
# GCLIB = -lgc
GCLIB =
+# GCLIB = -ldmalloc
PACKETDEF = -DPACKETVER=6 -DNEW_006b -DSO_REUSEPORT
#PACKETDEF = -DPACKETVER=5 -DNEW_006b