-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathpyopengl.diff
82 lines (78 loc) · 2.66 KB
/
pyopengl.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
diff --git a/setup.py b/setup.py
index 9c99241..cfec6bd 100644
--- a/setup.py
+++ b/setup.py
@@ -45,4 +45,5 @@ if __name__ == "__main__":
},
data_files=datafiles,
cmdclass=extra_commands,
+ libraries=[('',{'sources':[]})],
)
diff --git a/OpenGL/GLUT/special.py b/OpenGL/GLUT/special.py
index da3930ec..100c55a8 100644
--- a/OpenGL/GLUT/special.py
+++ b/OpenGL/GLUT/special.py
@@ -70,7 +70,7 @@ if __glutInitWithExit:
This is the Win32-specific version that handles
registration of an exit-function handler
"""
- return __glutCreateWindowWithExit(title, _exitfunc)
+ return __glutCreateWindowWithExit(as_8_bit(title), _exitfunc)
def glutCreateMenu(callback):
"""Create menu with given callback
diff --git a/OpenGL/__init__.py b/OpenGL/__init__.py
index f9cc6bfc..100f05d4 100644
--- a/OpenGL/__init__.py
+++ b/OpenGL/__init__.py
@@ -347,7 +347,7 @@ FormatHandler(
"numpy.float16",
"numpy.float32",
"numpy.float64",
- "numpy.float128",
+ # "numpy.float128",
],
isOutput=True,
)
diff --git a/OpenGL/platform/win32.py b/OpenGL/platform/win32.py
index 619e6c84..7c241802 100644
--- a/OpenGL/platform/win32.py
+++ b/OpenGL/platform/win32.py
@@ -4,14 +4,14 @@ import platform
from OpenGL.platform import ctypesloader, baseplatform
import sys
-if sys.hexversion < 0x2070000:
- vc = 'vc7'
-elif sys.hexversion >= 0x3050000:
- vc = 'vc14'
-elif sys.hexversion >= 0x3030000:
- vc = 'vc10'
-else:
- vc = 'vc9'
+# if sys.hexversion < 0x2070000:
+# vc = 'vc7'
+# elif sys.hexversion >= 0x3050000:
+# vc = 'vc14'
+# elif sys.hexversion >= 0x3030000:
+# vc = 'vc10'
+# else:
+# vc = 'vc9'
def _size():
return platform.architecture()[0].strip( 'bits' )
@@ -39,7 +39,7 @@ class Win32Platform( baseplatform.BasePlatform ):
return None
@baseplatform.lazy_property
def GLUT( self ):
- for possible in ('freeglut%s.%s'%(size,vc,), 'glut%s.%s'%(size,vc,)):
+ for possible in ('freeglut', 'freeglut%s'%(size,), 'glut%s'%(size,)):
# Prefer FreeGLUT if the user has installed it, fallback to the included
# GLUT if it is installed
try:
@@ -51,7 +51,7 @@ class Win32Platform( baseplatform.BasePlatform ):
return None
@baseplatform.lazy_property
def GLE( self ):
- for libName in ('gle%s.%s'%(size,vc,), 'opengle%s.%s'%(size,vc,)):
+ for libName in ('gle32', 'gle%s'%(size,), 'opengle%s'%(size,)):
try:
GLE = ctypesloader.loadLibrary( ctypes.cdll, libName )
GLE.FunctionType = ctypes.CFUNCTYPE