this one actually compiles. Version 1

6 files changed, 14 insertions, 31 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0a95d72..0000000
--- a/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-yetihack:
-	cd src && make
-
-package:
-	make clean
-	zip package/yetihack-source.zip ../YetiHack
-	make yetihack
-	strip src/yetihack
-	sudo chown root:root src/yetihack
-	dpkg-deb --build os/debian/deb package/yetihack.deb
-	cd package && sudo alien -r yetihack.deb
-	zip package/yetihack.zip src/yetihack
-
-install: yetihack
-	cp src/yetihack /usr/local/bin/
-
-clean:
-	-rm src/*.o
-	-rm src/yetihack
-	-rm os/package/yetihack.deb
-	-rm os/package/*.rpm
-
diff --git a/configure b/configure
index 246db38..856ff9c 100755
--- a/configure
+++ b/configure
@@ -1,9 +1,9 @@
-if [[ "$1" == "Linux" ]]; then
+if [[ "$1" == "linux" ]]; then
 	cp os/linux/Makefile ./
-elif [[ "$1" == "Windows" ]]; then
+elif [[ "$1" == "windows" ]]; then
 	cp os/windows/Makefile ./
 else
-	echo "Error! No os specified"
+	echo "Error! Please use an os in the os folder (not debian)"
 	exit 1
 fi
 exit 0
diff --git a/os/windows/Makefile b/os/windows/Makefile
index d1e8745..3f4ab15 100644
--- a/os/windows/Makefile
+++ b/os/windows/Makefile
@@ -1,11 +1,16 @@
-yetihack.exe: ../YetiHack.cpp
-	i586-mingw32msvc-g++ src/YetiHack.cpp src/yeti.cpp -o yetihack.exe -lpdcurses
+yetihack.exe: src/YetiHack.cpp
+	i586-mingw32msvc-g++ -Iinclude src/YetiHack.cpp src/yeti.cpp -o src/yetihack.exe -lpdcurses
 	-rm os/windows/yetihack-windows/yetihack.exe
-	ln yetihack.exe yetihack-windows
+	ln yetihack.exe os/windows/yetihack-windows/
 
 package: yetihack.exe
-	makensis install.nsi
-	zip yetihack-windows.zip yetihack-windows
+	YETIHACKDIR=`pwd`
+	export YETIHACKDIR
+	makensis os/windows/install.nsi
+	zip yetihack-windows.zip os/windows/yetihack-windows
+
+install: yetihack.exe
+	./YetiHack_installer.exe
 
 clean:
 	-rm yetihack.exe
diff --git a/os/windows/install.nsi b/os/windows/install.nsi
index a53078e..507acba 100644
--- a/os/windows/install.nsi
+++ b/os/windows/install.nsi
@@ -42,7 +42,7 @@ Section "YetiHack"
   SectionIn RO

   

   SetOutPath $INSTDIR

-  File "/home/ray/Documents/programming/YetiHack/windows/yetihack.exe"

+  File "$YETIHACKDIR/src/yetihack.exe"

   File "/usr/i586-mingw32msvc/bin/pdcurses.dll"

   

   ; Write the installation path into the registry

diff --git a/os/windows/yetihack-windows/yetihack.exe b/os/windows/yetihack-windows/yetihack.exe
index 58ec272..b7f7b5b 100755
--- a/os/windows/yetihack-windows/yetihack.exe
+++ b/os/windows/yetihack-windows/yetihack.exe
diff --git a/yetihack.exe b/yetihack.exe
new file mode 100755
index 0000000..b7f7b5b
--- /dev/null
+++ b/yetihack.exe