Changeset f6d9791 in sasview

Timestamp:

Dec 5, 2011 9:20:19 AM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

32122c0

Parents:

68dc52c6

Message:

Re #5 fixing mac build

File:

• sansview/setup_mac.py (modified) (2 diffs)

sansview/setup_mac.py

@@ -104 +104 @@
 EXCLUDES = ['PyQt4', 'sip', 'QtGui']
 
-# Cross-platform applications generally expect sys.argv to
-# be used for opening files. This requires argv_emulation = True
-argv_emulation = True
-# argv_emulation is not supported for 64-bit apps
-if platform.architecture()[0] == '64bit':
-    argv_emulation = False
-
-OPTIONS = {'argv_emulation': argv_emulation,
-           'packages': ['lxml','numpy', 'scipy', 'pytz', 'encodings'],
+OPTIONS = {'packages': ['lxml','numpy', 'scipy', 'pytz', 'encodings'],
            'iconfile': ICON,
            'frameworks':[libxml_path],
@@ -119 +111 @@
            'excludes' : EXCLUDES,
            }
+
+# Cross-platform applications generally expect sys.argv to
+# be used for opening files. This requires argv_emulation = True
+# ---> argv_emulation is not supported for 64-bit apps
+if not platform.architecture()[0] == '64bit':
+    OPTIONS['argv_emulation'] = True
+
 setup(
     app=APP,