Ticket #30331: setup_py.diff

setup.py

@@ -101 +101 @@
         #
         # REMEMEBER to use "./ext/bin/python ..."
         #
-        EXT = os.getcwd()+"/ext"
+        EXT = "@PREFIX@"
         inc_dirs=["ov/src",
                   "layer0","layer1","layer2",
                   "layer3","layer4","layer5", 
-                  "/usr/X11R6/include",
                   EXT+"/include",
                   EXT+"/include/GL",
                   EXT+"/include/freetype2",
@@ -118 +117 @@
         def_macros=[("_PYMOL_MODULE",None),
                     ("_PYMOL_LIBPNG",None),
                     ("_PYMOL_FREETYPE",None),
+                    ("_PYMOL_INLINE",None),
+                    ("_PYMOL_NUMPY",None),
+                    ("_PYMOL_OPENGL_SHADERS",None),
+                    ("NO_MMLIBS",None),
                     ]
-        ext_comp_args=[]
+        ext_comp_args=["-ffast-math","-funroll-loops","-O3","-fcommon"]
         ext_link_args=[
-                       "-L/usr/X11R6/lib64", "-lGL", "-lXxf86vm",
-                   "-L"+EXT+"/lib", "-lpng", "-lglut", "-lfreetype"
+                   "-L"+EXT+"/lib", "-lpng", "-lGL", "-lglut", "-lGLEW", "-lfreetype"
                    ]
 #============================================================================
 else: # linux or other unix
@@ -181 +183 @@
                 'pymol/opengl/glu',
                 'pymol/opengl/glut',
                 'pymol/wizard',
+                'pymol2',
                 'web',
                 'web/examples',
                 'web/javascript', ],