mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-27 09:54:36 +02:00
Code Issues Projects Releases Wiki Activity

64bit fixes, thanks a ton jacksonmj :D

Browse Source
This commit is contained in:
Lieuwe
2011-03-26 16:45:38 +01:00
parent 05730797d8
commit 3d71ab5582
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -19,7 +19,7 @@ powder: $(SOURCES)
$(COMPILER) -DINTERNAL -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64 $(COMPILER) -DINTERNAL -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64
mv $@ build mv $@ build
powder-debug-64: $(SOURCES) powder-debug-64: $(SOURCES)
$(PYCOMMAND) --64bit $(PYCOMMAND)
$(COMPILER) -m64 -o$@ $(FLAGS_DBUG) -DLIN64 -DPYEXT $(SOURCES) -Iincludes/ $(COMPILER) -m64 -o$@ $(FLAGS_DBUG) -DLIN64 -DPYEXT $(SOURCES) -Iincludes/
mv $@ build mv $@ build
powder-debug: $(SOURCES) powder-debug: $(SOURCES)
@@ -42,17 +42,17 @@ powder-sse: $(SOURCES)
strip $@ strip $@
mv $@ build mv $@ build
powder-64-sse3-opengl: $(SOURCES) powder-64-sse3-opengl: $(SOURCES)
$(PYCOMMAND) --64bit $(PYCOMMAND)
$(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64 -DPYEXT -lGL -lGLU -DOpenGL $(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64 -DPYEXT -lGL -lGLU -DOpenGL
strip $@ strip $@
mv $@ build mv $@ build
powder-64-sse3: $(SOURCES) powder-64-sse3: $(SOURCES)
$(PYCOMMAND) --64bit $(PYCOMMAND)
$(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64 -DPYEXT $(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64 -DPYEXT
strip $@ strip $@
mv $@ build mv $@ build
powder-64-sse2: $(SOURCES) powder-64-sse2: $(SOURCES)
$(PYCOMMAND) --64bit $(PYCOMMAND)
$(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE2) $(SOURCES) -DLIN64 -DPYEXT $(COMPILER) -m64 -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE2) $(SOURCES) -DLIN64 -DPYEXT
strip $@ strip $@
mv $@ build mv $@ build

2
getheader.py
View File

@@ -21,7 +21,7 @@ with open("./includes/defines.h") as fid:
print "using external console.py" print "using external console.py"
ext=True""" ext=True"""
#print sys.argv #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 ext=True
print "YEAHS" print "YEAHS"
#raw_input("") #raw_input("")

3
includes/defines.h
View File

@@ -69,8 +69,7 @@ extern unsigned char ZSIZE;
#define PYCONSOLE #define PYCONSOLE
//#define PYEXT //#define PYEXT
//WARNING pyext must be defined on 64bit! //no longer needed
//also, don't add a comment on that line, it breaks.
#ifdef PIX16 #ifdef PIX16
typedef unsigned short pixel; typedef unsigned short pixel;

4
src/main.c
View File

@@ -30,6 +30,7 @@
#include "Python.h" #include "Python.h"
#include "pyconsole.h" #include "pyconsole.h"
//#include "pystdlib.h" //#include "pystdlib.h"
#include <marshal.h>
char pyready=1; char pyready=1;
char pygood=1; char pygood=1;
#endif #endif
@@ -1992,6 +1993,7 @@ emb_set_tool(PyObject *self, PyObject *args)
return Py_BuildValue("i",1); return Py_BuildValue("i",1);
} }
/*
static PyObject* static PyObject*
emb_press_mouse(PyObject *self, PyObject *args) emb_press_mouse(PyObject *self, PyObject *args)
{ {
@@ -2028,7 +2030,7 @@ emb_release_mouse(PyObject *self, PyObject *args)
ev.button.x=x; ev.button.x=x;
ev.button.y=y; ev.button.y=y;
return Py_BuildValue("i",SDL_PushEvent(ev)); return Py_BuildValue("i",SDL_PushEvent(ev));
} }*/
static PyMethodDef EmbMethods[] = { //WARNING! don't forget to register your function here! static PyMethodDef EmbMethods[] = { //WARNING! don't forget to register your function here!