Index: branches/meklort/i386/modules/KextPatcher/kext_patcher.c
===================================================================
--- branches/meklort/i386/modules/KextPatcher/kext_patcher.c	(revision 739)
+++ branches/meklort/i386/modules/KextPatcher/kext_patcher.c	(revision 740)
@@ -530,7 +530,7 @@
 	char* orig_string	= XMLCastString(replace);
 	verbose("Patching %s, replacing %s with %s\n", personalityName, orig_string, nameMatch);
 	replace_string(orig_string, nameMatch, plistbuffer + XMLCastStringOffset(replace), 10240);
-	
+	return true;
 }
 
 bool patch_bcm_kext(TagPtr plist, char* plistbuffer, void* start)
Index: branches/meklort/i386/modules/KextPatcher/include/hex_editor.h
===================================================================
--- branches/meklort/i386/modules/KextPatcher/include/hex_editor.h	(revision 739)
+++ branches/meklort/i386/modules/KextPatcher/include/hex_editor.h	(revision 740)
@@ -12,6 +12,6 @@
 
 int replace_patern(char* pattern, char* repalcement, char* buffer, long buffer_size);
 int replace_word(uint32_t pattern, uint32_t repalcement, char* buffer, long buffer_size);
-void replace_string(char* find, char* replace, char* string, int length);
+void replace_string(char* find, const char* replace, char* string, int length);
 void replace_bytes(char* find, int find_size, char* replace, int replace_size, char* exec, int length);
 #endif /* H_HEX_EDITOR */
\ No newline at end of file
Index: branches/meklort/i386/modules/KextPatcher/hex_editor.c
===================================================================
--- branches/meklort/i386/modules/KextPatcher/hex_editor.c	(revision 739)
+++ branches/meklort/i386/modules/KextPatcher/hex_editor.c	(revision 740)
@@ -75,7 +75,7 @@
 	return num_replaced;
 }
 
-void replace_string(char* find, char* replace, char* string, int length)
+void replace_string(char* find, const char* replace, char* string, int length)
 {
 	if(!find ||
 	   !replace ||
Index: branches/meklort/i386/modules/KextPatcher/Makefile
===================================================================
--- branches/meklort/i386/modules/KextPatcher/Makefile	(revision 739)
+++ branches/meklort/i386/modules/KextPatcher/Makefile	(revision 740)
@@ -2,10 +2,10 @@
 MODULE_VERSION = "1.0.0"
 MODULE_COMPAT_VERSION = "1.0.0"
 MODULE_START = _$(MODULE_NAME)_start
-MODULE_DEPENDENCIES = 
-
+MODULE_DEPENDENCIES =
 DIR = KextPatcher
 
+
 MODULE_OBJS = kext_patcher.o inflate.o deflate.o zutil.o inftrees.o inffast.o adler32.o hex_editor.o trees.o
 
 OPTIM = -Os -Oz
@@ -39,4 +39,5 @@
 
 all embedtheme optionrom: dylib
 
+
 include ../MakeInc.dir
\ No newline at end of file
Index: branches/meklort/i386/modules/ACPIPatcher/Makefile
===================================================================
--- branches/meklort/i386/modules/ACPIPatcher/Makefile	(revision 739)
+++ branches/meklort/i386/modules/ACPIPatcher/Makefile	(revision 740)
@@ -2,7 +2,7 @@
 MODULE_VERSION = "1.0.0"
 MODULE_COMPAT_VERSION = "1.0.0"
 MODULE_START = _$(MODULE_NAME)_start
-MODULE_DEPENDENCIES = 
+MODULE_DEPENDENCIES = klibc
 
 DIR = ACPIPatcher
 
Index: branches/meklort/i386/modules/GUI/Makefile
===================================================================
--- branches/meklort/i386/modules/GUI/Makefile	(revision 739)
+++ branches/meklort/i386/modules/GUI/Makefile	(revision 740)
@@ -2,7 +2,7 @@
 MODULE_VERSION = "1.0.0"
 MODULE_COMPAT_VERSION = "1.0.0"
 MODULE_START = _$(MODULE_NAME)_start
-MODULE_DEPENDENCIES = 
+MODULE_DEPENDENCIES = Resolution
 
 DIR = GUI
 
Index: branches/meklort/i386/modules/MakeInc.dir
===================================================================
--- branches/meklort/i386/modules/MakeInc.dir	(revision 739)
+++ branches/meklort/i386/modules/MakeInc.dir	(revision 740)
@@ -11,15 +11,13 @@
 LIBSAIODIR = ../../libsaio
 BOOT2DIR = ../../boot2
 
+MODULE_DEPENDENCIES := $(foreach x,$(MODULE_DEPENDENCIES),-weak_library $(SYMROOT)/$(x).dylib)
+
+
 INSTALLDIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone
 
 dylib: ${MODULE_OBJS} dylib_final
 
-HAVE_MODULES := $(wildcard $(SYMROOT)/*.dylib)
-##IS_CPP_MODULE = $(shell nm $(OBJROOT)/*.o  | grep " __Z")
-
-ifneq ($(strip $(HAVE_MODULES)),) 
-#### Other modules Exist ####
 dylib_final: 
 	@rm -rf $(SYMROOT)/$(MODULE_NAME).dylib	#ensure module doesn't link with old version of self
 	@echo "\t[LD] $(MODULE_NAME).dylib"
@@ -36,36 +34,12 @@
 	-L$(SYMROOT)/ \
 	$(OBJROOT)/*.o \
 	-weak_library $(OBJROOT)/../../boot2/Symbols_LINKER_ONLY.dylib \
-	-weak_library $(SYMROOT)/*.dylib \
+	$(MODULE_DEPENDENCIES) \
 	-macosx_version_min 10.6 \
 	-o $(SYMROOT)/$(MODULE_NAME).dylib
 	
 	@cp -rf include/* ../module_includes/ &> /dev/null || true
 	
-else
-
-#### This is the first module ####
-dylib_final:
-	@rm -rf $(SYMROOT)/$(MODULE_NAME).dylib	#ensure module doesn't link with old version of self
-	@echo "\t[LD] $(MODULE_NAME).dylib"
-	@ld -arch i386 \
-	-alias $(MODULE_START) start \
-	-dylib -read_only_relocs suppress \
-	-S -x -Z -dead_strip_dylibs \
-	-no_uuid \
-	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
-	-final_output $(MODULE_NAME) \
-	-L$(OBJROOT)/ \
-	-L$(OBJROOT)/../ \
-	-L$(SYMROOT)/ \
-	$(OBJROOT)/*.o \
-	-weak_library $(OBJROOT)/../../boot2/Symbols_LINKER_ONLY.dylib \
-	-macosx_version_min 10.6 \
-	-o $(SYMROOT)/$(MODULE_NAME).dylib
-
-	@cp -rf include/* ../module_includes/ &> /dev/null || true
-endif
-
 %.o: %.c
 	@echo "\t[CC] $<"
 	@$(CC) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ -I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@"
Index: branches/meklort/i386/modules/uClibc++/Makefile
===================================================================
--- branches/meklort/i386/modules/uClibc++/Makefile	(revision 739)
+++ branches/meklort/i386/modules/uClibc++/Makefile	(revision 740)
@@ -3,7 +3,7 @@
 MODULE_VERSION = "0.2.2"
 MODULE_COMPAT_VERSION = "0.2.2"
 MODULE_START = _uClibcxx_start
-MODULE_DEPENDENCIES = 
+MODULE_DEPENDENCIES = klibc
 
 DIR = uClibc++
 # sstream.o fstream.o
Index: branches/meklort/i386/modules/Memory/Makefile
===================================================================
--- branches/meklort/i386/modules/Memory/Makefile	(revision 739)
+++ branches/meklort/i386/modules/Memory/Makefile	(revision 740)
@@ -2,7 +2,7 @@
 MODULE_VERSION = "1.0.0"
 MODULE_COMPAT_VERSION = "1.0.0"
 MODULE_START = _$(MODULE_NAME)_start
-MODULE_DEPENDENCIES = 
+MODULE_DEPENDENCIES = klibc
 
 DIR = Memory