Bugfixes, and pymake removal.

4 files changed, 4 insertions, 86 deletions

diff --git a/Makefile b/Makefile
index 2257ecc..7e45c16 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: pymake
+.PHONY: build
 
-pymake:
-        pymake
+build:
+        build
diff --git a/pymake.conf b/pymake.conf
deleted file mode 100644
index 16ed18e..0000000
--- a/pymake.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-### pymake by ~3o~ph()g (neonphog.com) ###
-## This skeleton file was generated by pymake... please edit for your project.
-
-CXXFLAGS: -ggdb -fPIC
-LDFLAGS: -ggdb
-
-[BUILD]
-DIR: src
-COMMAND: lib
-OUTPUT: libbu++.a
-
-[TRIGGER]
-INPUT: .cpp    #take input of *.cpp files
-OUTPUT: .o     #output .o files
-COMMAND: g++ -fPIC -c {INPUT} {CXXFLAGS} -I{DIR} -o {OUTPUT}
-CHECK: g++ -M {INPUT} {CXXFLAGS} -I{DIR}
-
-### Executable command ###
-## Use this command if you want a simple executable
-[COMMAND]
-NAME: exe
-COMMAND: g++ {INPUT} {LDFLAGS} -o {OUTPUT}
-
-### Library command ###
-## Use this command if you wish to create a library
-[COMMAND]
-NAME: lib
-COMMAND: ar cr{ARFLAGS} {OUTPUT} {INPUT}
-
diff --git a/pymake.tests.conf b/pymake.tests.conf
deleted file mode 100644
index d5719d4..0000000
--- a/pymake.tests.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-### pymake by ~3o~ph()g (neonphog.com) ###
-## This skeleton file was generated by pymake... please edit for your project.
-
-CXXFLAGS: -ggdb -fPIC
-LDFLAGS: -ggdb
-
-#[BUILD]
-#DIR: src
-#COMMAND: lib
-#OUTPUT: libbu++.a
-
-#
-# Uncomment this if you want to build the tests, these don't rely on anything
-# that libbu++ doesn't rely on.
-#
-[DIRBUILD]
-COMMAND: exe
-OUTPUT: tests/{NAME}
-ROOT: src/test
-LDFLAGS: -L. -lbu++
-CXXFLAGS: -Isrc -Isrc/test
-
-[OVERRIDE]
-FILE: tests/plugin
-LDFLAGS: -ldl
-
-#
-# Uncomment this if you have cpptest and want to build the unit tests
-#
-#[DIRBUILD]
-#COMMAND: exe
-#OUTPUT: unit/{NAME}
-#ROOT: src/unit
-#LDFLAGS: -L. -lbu++ -lcpptest
-#CXXFLAGS: -Isrc
-
-[TRIGGER]
-INPUT: .cpp    #take input of *.cpp files
-OUTPUT: .o     #output .o files
-COMMAND: g++ -fPIC -c {INPUT} {CXXFLAGS} -I{DIR} -o {OUTPUT}
-CHECK: g++ -M {INPUT} {CXXFLAGS} -I{DIR}
-
-### Executable command ###
-## Use this command if you want a simple executable
-[COMMAND]
-NAME: exe
-COMMAND: g++ {INPUT} {LDFLAGS} -o {OUTPUT}
-
-### Library command ###
-## Use this command if you wish to create a library
-[COMMAND]
-NAME: lib
-COMMAND: ar cr{ARFLAGS} {OUTPUT} {INPUT}
-
diff --git a/src/hashtable.cpp b/src/hashtable.cpp
index 37c3149..725ebc4 100644
--- a/src/hashtable.cpp
+++ b/src/hashtable.cpp
@@ -399,6 +399,7 @@ bool HashTable::del( const void *id, int nSkip )
         for( unsigned long int j=0; j < 32; nPos = (nPos+(1<<j))%nTableSize, j++ )
         {
                 if( !isFilled( nPos ) ) return false;
+                //printf("0x%08X \"%s\" == 0x%08X \"%s\" (%d)\n", id, id, aTable[nPos].id, aTable[nPos].id, nPos );
                 if( hFunc->cmpIDs( id, aTable[nPos].id ) &&
                         aTable[nPos].bDeleted == false )
                 {