Przeglądaj źródła

Fix 'make tools' target for ./configure
Fix update.pl wasn't able to recompile due to path error.

Lighta 10 lat temu
rodzic
commit
d1eeda3466
3 zmienionych plików z 3 dodań i 1 usunięć
  1. 1 0
      .gitignore
  2. 1 1
      src/tool/Makefile.in
  3. 1 0
      tools/update.pl

+ 1 - 0
.gitignore

@@ -133,3 +133,4 @@ Thumbs.db
 /.idea/rathena.iml
 /.idea/vcs.xml
 /.idea/workspace.xml
+/build/

+ 1 - 1
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/
 

+ 1 - 0
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');