Text archives Help
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1437 - in trunk: CMake SwigInterface
- Date: Thu, 28 Jun 2007 17:31:59 -0600 (MDT)
Author: abe
Date: Thu Jun 28 17:31:59 2007
New Revision: 1437
Modified:
trunk/CMake/FindTeem.cmake
trunk/SwigInterface/wxManta.py
Log:
Bad day for cross platform code on the Mac :-(
Teem 1.9 won't link to shared libs on Mac...
M CMake/FindTeem.cmake
Passing a render context argument list causes wxpython to crash on
Mac. Note if you are a linux user and you don't want to see gl errors
when running wxManta you will need to uncomment line wxManta.py:116
and comment out line 119 until we find a fix.
(Presumably more people are using this code on Mac anyway??)
M SwigInterface/wxManta.py
Modified: trunk/CMake/FindTeem.cmake
==============================================================================
--- trunk/CMake/FindTeem.cmake (original)
+++ trunk/CMake/FindTeem.cmake Thu Jun 28 17:31:59 2007
@@ -21,11 +21,15 @@
# These options are specifically tuned for many compilers in Manta.
#
+IF (NOT APPLE)
+
# First locate the unu command in the path.
FIND_PATH(FOUND_TEEM_BIN unu
DOC "Location of teem binaries (like unu)"
)
+ENDIF(NOT APPLE)
+
# Check to see if unu/teem is in the path.
IF (FOUND_TEEM_BIN)
@@ -42,7 +46,7 @@
INCLUDE(${FOUND_TEEMCONFIG_CMAKE})
# Enable found flag.
- SET(FOUND_TEEM TRUE)
+ SET(FOUND_TEEM TRUE)
# Add the include directory to the build
INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
Modified: trunk/SwigInterface/wxManta.py
==============================================================================
--- trunk/SwigInterface/wxManta.py (original)
+++ trunk/SwigInterface/wxManta.py Thu Jun 28 17:31:59 2007
@@ -111,7 +111,12 @@
# updateFramerate is a function that you call to update the framerate
def __init__(self, parent, sync_display, opengl_display, updateFramerate,
size=wx.Size(xres,yres)):
- wxGLCanvas.__init__(self, parent, -1, attribList=[GL_DOUBLEBUFFER],
style=wx.NO_BORDER, size=size)
+
+ # This line for linux.
+ # wxGLCanvas.__init__(self, parent, -1, attribList=[GL_DOUBLEBUFFER,
0], style=wx.NO_BORDER, size=size)
+
+ # This line for OSX
+ wxGLCanvas.__init__(self, parent, -1, style=wx.NO_BORDER, size=size)
self.sync_display = sync_display
self.opengl_display = opengl_display
- [MANTA] r1437 - in trunk: CMake SwigInterface, abe, 06/28/2007
Archive powered by MHonArc 2.6.16.