Changeset f9303b6 in sasview for sansmodels


Ignore:
Timestamp:
Dec 5, 2011 10:17:01 AM (13 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:
0f2c15d
Parents:
bc69dcc
Message:

Re #5 fixing samsmodels compilation on MSVC

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/setup.py

    r0abf7bf rf9303b6  
    3030                   "CSchulz.cpp", 
    3131                   "WrapperGenerator.py", 
    32                    "wrapping.py", 
    33                    "winFuncs.c"] 
     32                   "wrapping.py" 
     33                   ] 
     34if not os.name=='nt': 
     35    IGNORED_FILES.extend(["gamma_win.c","winFuncs.c"]) 
     36 
    3437EXTENSIONS = [".c", ".cpp"] 
    3538 
     
    6164 
    6265 
     66smearer_sources = [os.path.join(smear_dir, "smearer.cpp"), 
     67                  os.path.join(smear_dir, "smearer_module.cpp")] 
     68if os.name=='nt': 
     69    smearer_sources.append(os.path.join(igordir, "winFuncs.c")) 
     70 
    6371dist = setup( 
    6472    name="sansmodels", 
     
    8795        # Smearer extension 
    8896        Extension("sans.models.sans_extension.smearer", 
    89                    sources = [os.path.join(smear_dir,  
    90                                           "smearer.cpp"), 
    91                              os.path.join(smear_dir, "smearer_module.cpp"),], 
    92         include_dirs=[smear_dir, numpy_incl_path]), 
     97                   sources = smearer_sources, 
     98                   include_dirs=[smear_dir, numpy_incl_path]), 
    9399        Extension("sans.models.sans_extension.smearer2d_helper", 
    94100                  sources = [os.path.join(smear_dir,  
    95101                                          "smearer2d_helper_module.cpp"), 
    96102                             os.path.join(smear_dir, "smearer2d_helper.cpp"),], 
    97         include_dirs=[smear_dir,numpy_incl_path] 
     103                  include_dirs=[smear_dir,numpy_incl_path] 
    98104        ) 
    99105        ] 
Note: See TracChangeset for help on using the changeset viewer.