From 3d71ab5582835ee72cff2f5691abfa7e03a1b682 Mon Sep 17 00:00:00 2001
From: Lieuwe <lieuwemo@gmail.com>
Date: Sat, 26 Mar 2011 16:45:38 +0100
Subject: [PATCH] 64bit fixes, thanks a ton jacksonmj :D

---
 Makefile           | 8 ++++----
 getheader.py       | 2 +-
 includes/defines.h | 3 +--
 src/main.c         | 4 +++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 40f6f9fbe..1b0b10a80 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ powder: $(SOURCES)
 	$(COMPILER) -DINTERNAL -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64
 	mv $@ build
 powder-debug-64: $(SOURCES)
-	$(PYCOMMAND) --64bit
+	$(PYCOMMAND)
 	$(COMPILER) -m64 -o$@ $(FLAGS_DBUG) -DLIN64 -DPYEXT $(SOURCES) -Iincludes/
 	mv $@ build
 powder-debug: $(SOURCES)
@@ -42,17 +42,17 @@ powder-sse: $(SOURCES)
 	strip $@
 	mv $@ build
 powder-64-sse3-opengl: $(SOURCES)
-	$(PYCOMMAND) --64bit
+	$(PYCOMMAND)
 	$(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64 -DPYEXT -lGL -lGLU -DOpenGL
 	strip $@
 	mv $@ build
 powder-64-sse3: $(SOURCES)
-	$(PYCOMMAND) --64bit
+	$(PYCOMMAND)
 	$(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64 -DPYEXT
 	strip $@
 	mv $@ build
 powder-64-sse2: $(SOURCES)
-	$(PYCOMMAND) --64bit
+	$(PYCOMMAND)
 	$(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE2) $(SOURCES) -DLIN64 -DPYEXT
 	strip $@
 	mv $@ build
diff --git a/getheader.py b/getheader.py
index 6a131d71c..f938a2a4f 100644
--- a/getheader.py
+++ b/getheader.py
@@ -21,7 +21,7 @@ with open("./includes/defines.h") as fid:
             print "using external console.py"
             ext=True"""
 #print sys.argv
-if(len(sys.argv)>=2 and sys.argv[1]=="--64bit"):
+if(len(sys.argv)>=2 and sys.argv[1]=="--ext"):
     ext=True
     print "YEAHS"
 #raw_input("")
diff --git a/includes/defines.h b/includes/defines.h
index a4fa57e4c..a6114863d 100644
--- a/includes/defines.h
+++ b/includes/defines.h
@@ -69,8 +69,7 @@ extern unsigned char ZSIZE;
 
 #define PYCONSOLE
 //#define PYEXT
-//WARNING pyext must be defined on 64bit!
-//also, don't add a comment on that line, it breaks.
+//no longer needed
 
 #ifdef PIX16
 typedef unsigned short pixel;
diff --git a/src/main.c b/src/main.c
index e40956080..bb3f5b799 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,6 +30,7 @@
 #include "Python.h"
 #include "pyconsole.h"
 //#include "pystdlib.h"
+#include <marshal.h>
 char pyready=1;
 char pygood=1;
 #endif
@@ -1992,6 +1993,7 @@ emb_set_tool(PyObject *self, PyObject *args)
     return Py_BuildValue("i",1);
 }
 
+/*
 static PyObject*
 emb_press_mouse(PyObject *self, PyObject *args)
 {
@@ -2028,7 +2030,7 @@ emb_release_mouse(PyObject *self, PyObject *args)
     ev.button.x=x;
     ev.button.y=y;
     return Py_BuildValue("i",SDL_PushEvent(ev));
-}
+}*/
 
 
 static PyMethodDef EmbMethods[] = { //WARNING! don't forget to register your function here!