Use environment path variables where needed, to avoid hardcoding inst…

…allation paths.

NDSPython/Makefile

@@ -10,7 +10,7 @@ include $(DEVKITARM)/ds_rules
 export TARGET		:=	$(shell basename $(CURDIR))
 export TOPDIR		:=	$(CURDIR)
 
-NITRO_FILES := /C/devkitPro/dspython/NDSpython/nitrofiles
+NITRO_FILES := $(DSPYTHON)/NDSpython/nitrofiles
 
 .PHONY: $(TARGET).arm7 $(TARGET).arm9
 

NDSPython/arm7/Makefile

@@ -42,7 +42,7 @@ LIBS	:=	-ldswifi7 -lmm7 -lnds7
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBNDS := /C/devkitPro/dspython/libnds-1.4.6
+LIBNDS := $(DSPYTHON)/libnds-1.4.6
 LIBDIRS	:=	$(LIBNDS)
 
 

NDSPython/arm9/Makefile

@@ -25,7 +25,7 @@ INCLUDES	:=	include
 #---------------------------------------------------------------------------------
 # custom directories
 #---------------------------------------------------------------------------------
-PARDIR		:=	/C/devkitPro/dspython/
+PARDIR		:=	$(DSPYTHON)/
 PYTHON_DIR	:=	$(PARDIR)slp-250
 ZLIB_DIR	:=	$(PARDIR)zlib-1.2.3
 EXTRA_LIBS	:=	-L$(PYTHON_DIR) -L$(ZLIB_DIR)
@@ -60,7 +60,7 @@ LIBS	:=  -lfilesystem  -lfat -lnds9 -lpython2.5 -lm -lz
 #---------------------------------------------------------------------------------
 
 # overwrite ds_rules
-LIBNDS := /C/devkitPro/dspython/libnds-1.4.6
+LIBNDS := $(DSPYTHON)/libnds-1.4.6
 
 LIBDIRS	:=	$(LIBNDS)
 

NDSPython/wrappers

@@ -1,6 +1,6 @@
-LIBNDS_INCLUDE=/c/devkitPro/dspython/libnds-1.4.6/include
-MOD_SRCDIR=/c/devkitPro/dspython/NDSpython/arm9/source
-pyrex_scripts=/c/Python26/Scripts/pyrexc.py
+LIBNDS_INCLUDE=$DSPYTHON/libnds-1.4.6/include
+MOD_SRCDIR=$DSPYTHON/NDSpython/arm9/source
+pyrex_scripts=$PYTHONDIR/Scripts/pyrexc.py
 
 python $pyrex_scripts $LIBNDS_INCLUDE/nds/wrap_system.pyx -o $MOD_SRCDIR/wrap_system.c
 python $pyrex_scripts $LIBNDS_INCLUDE/nds/wrap_interrupts.pyx -o $MOD_SRCDIR/wrap_interrupts.c

libnds-1.4.6/include/nds/arm9/wrap_background.pyx

@@ -54,7 +54,7 @@ cdef extern from "nds/arm9/decompress.h":
 	ctypedef enum DecompressType:
 		pass
 
-cdef extern from "C:/devkitPro/dspython/NDSpython/arm9/source/extern.h":
+cdef extern from "../../NDSpython/arm9/source/extern.h":
 	void c_decompress_file "decompress_file" (char *filename,unsigned int dst,DecompressType type_de)
 
 def bgInit(layer,type_bg,size_bg,mapBase,tileBase):
@@ -74,10 +74,3 @@ def bgUpdate():
 
 def decompress_file(filename,dst,type_de):
 	c_decompress_file(filename,dst,type_de)
-
-
-
-
-
-
-

msys_pyds.bat

@@ -1,6 +1,6 @@
 SET PYTHONDIR=/c/Python26/
 SET DEVKITPRO=/c/devkitPro/
-SET DSPYTHON=/c/devkitPro/dspython/
+SET DSPYTHON=/c/dspython/
 SET MINGWDIR=/c/MinGW/
 
 rem

slp-250/Modules/Setup

@@ -451,7 +451,7 @@ _random _randommodule.c	# Random number generator
 # This require zlib 1.1.3 (or later).
 # See http://www.gzip.org/zlib/
 #  zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-   zlib zlibmodule.c -I/C/devkitPro/dspython/zlib-1.2.3 -L/C/devkitPro/dspython/zlib-1.2.3 -lz
+   zlib zlibmodule.c -I$(DSPYTHON)/zlib-1.2.3 -L$(DSPYTHON)/zlib-1.2.3 -lz
 # Interface to the Expat XML parser
 #
 # Expat was written by James Clark and is now maintained by a group of