diff options
| author | Lieuwe <lieuwemo@gmail.com> | 2011-03-26 15:45:38 (GMT) |
|---|---|---|
| committer | Lieuwe <lieuwemo@gmail.com> | 2011-03-26 15:45:38 (GMT) |
| commit | 3d71ab5582835ee72cff2f5691abfa7e03a1b682 (patch) | |
| tree | 293e2b64acce43782a291f1142851eeb8ca3a78d | |
| parent | 05730797d888a62097d8c46a7155fff504e1658c (diff) | |
| download | powder-3d71ab5582835ee72cff2f5691abfa7e03a1b682.zip powder-3d71ab5582835ee72cff2f5691abfa7e03a1b682.tar.gz | |
64bit fixes, thanks a ton jacksonmj :D
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | getheader.py | 2 | ||||
| -rw-r--r-- | includes/defines.h | 3 | ||||
| -rw-r--r-- | src/main.c | 4 |
4 files changed, 9 insertions, 8 deletions
@@ -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 6a131d7..f938a2a 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 a4fa57e..a611486 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; @@ -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! |