Changeset a6d2e3b in sasview

Timestamp:

Feb 13, 2015 8:52:30 AM (10 years ago)

Author:

pkienzle

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:

254ec8b

Parents:

a7dcc95

Message:

allow build using msvc

Files:

• setup.py (modified) (2 diffs)
• src/sas/models/c_extension/c_models/librefl.c (modified) (1 diff)

setup.py

@@ -336 +336 @@
             os.path.join(smear_dir, "smearer2d_helper_module.cpp"),
             os.path.join(smear_dir, "smearer2d_helper.cpp"),
+            os.path.join(igordir, "winFuncs.c"),
         ],
         include_dirs=[smear_dir, numpy_incl_path],
@@ -346 +347 @@
             os.path.join(c_model_dir, "libfunc.c"),
             os.path.join(c_model_dir, "librefl.c"),
+            os.path.join(igordir, "winFuncs.c"),
         ],
         include_dirs=[gen_dir, includedir,  c_model_dir, numpy_incl_path],

src/sas/models/c_extension/c_models/librefl.c

@@ -8 +8 @@
 #include <stdlib.h>
 #if defined(_MSC_VER)
-#include "winFuncs.h"
+#include "../libigor/winFuncs.h"
 #endif