diff --git a/.gitignore b/.gitignore index f22b4bdbf3..9a3934bb8c 100644 --- a/.gitignore +++ b/.gitignore @@ -133,3 +133,4 @@ Thumbs.db /.idea/rathena.iml /.idea/vcs.xml /.idea/workspace.xml +/build/ \ No newline at end of file diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in index 636f44e455..8e37c1113e 100644 --- a/src/tool/Makefile.in +++ b/src/tool/Makefile.in @@ -1,6 +1,6 @@ COMMON_OBJ = minicore.o malloc.o showmsg.o strlib.o utils.o des.o grfio.o -COMMON_DIR_OBJ = $(COMMON_OBJ:%=../common/obj_all/%) +COMMON_DIR_OBJ = $(COMMON_OBJ:%=../common/obj/%) COMMON_H = $(shell ls ../common/*.h) COMMON_INCLUDE = -I../common/ diff --git a/tools/update.pl b/tools/update.pl index c01d51e8ff..499234c5dc 100755 --- a/tools/update.pl +++ b/tools/update.pl @@ -210,6 +210,7 @@ sub UpdateSQL { my($sBaseDir,$sInit,$rhFileState) = @_; } sub RunCompilation { my($sBaseDir,$sTarget) = @_; + chdir "$sBaseDir/.."; if($^O =~ "linux"){ print "Recompiling...\n"; system('./configure && make clean server');