Explorar el Código

Fix path problem when using build.sh

dalu98 hace 3 años
padre
commit
e0993ec75e
Se han modificado 2 ficheros con 8 adiciones y 8 borrados
  1. 8 8
      build.sh
  2. 0 0
      tools/txt2gam.exe

+ 8 - 8
build.sh

@@ -10,26 +10,26 @@ QSPFILE=glife.qsp
 
 #######################################################################
 
-./txtmerge.py locations glife.txt
+python tools/txtmerge.py locations glife.txt
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
-	./txt2gam.linux glife.txt "${QSPFILE}" 1> /dev/null
+	./tools/txt2gam.linux glife.txt "${QSPFILE}" 1> /dev/null
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-	./txt2gam.mac glife.txt "${QSPFILE}" 1> /dev/null
+	./tools/txt2gam.mac glife.txt "${QSPFILE}" 1> /dev/null
 elif [[ "$OSTYPE" == "msys" ]]; then
 	if [[ "$MSYSTEM_CARCH" == "x86_64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	else
-		./txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
 	fi
 elif [[ "$OSTYPE" == "cygwin" ]]; then
 	# Unsure if non-AMD CPUs give this or AMD64, tested on an actual AMD brand chip
 	# requires a python install visible to cygwin (for the txtmerge above)
 	if [[ "$PROCESSOR_ARCHITECTURE" == "x86_64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	elif [[ "$PROCESSOR_ARCHITECTURE" == "AMD64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	else
-		./txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
 	fi
 fi
 if [ -d "${DESTDIR}" ]; then

+ 0 - 0
tools/txt2gam.exe