/[escript]/trunk/scons/windows_intelc_options.py
ViewVC logotype

Contents of /trunk/scons/windows_intelc_options.py

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1628 - (show annotations)
Fri Jul 11 13:12:46 2008 UTC (11 years, 4 months ago) by phornby
File MIME type: text/x-python
File size: 2171 byte(s)

Merge in /branches/windows_from_1456_trunk_1620_merged_in branch.

You will find a preserved pre-merge trunk in tags under tags/trunk_at_1625.
That will be useful for diffing & checking on my stupidity.

Here is a list of the conflicts and their resolution at this
point in time.


=================================================================================
(LLWS == looks like white space).

finley/src/Assemble_addToSystemMatrix.c - resolve to branch - unused var. may be wrong.....
finley/src/CPPAdapter/SystemMatrixAdapter.cpp - resolve to branch - LLWS
finley/src/CPPAdapter/MeshAdapter.cpp - resolve to branch - LLWS
paso/src/PCG.c - resolve to branch - unused var fixes.
paso/src/SolverFCT.c - resolve to branch - LLWS
paso/src/FGMRES.c - resolve to branch - LLWS
paso/src/Common.h - resolve to trunk version. It's omp.h's include... not sure it's needed,
but for the sake of saftey.....
paso/src/Functions.c - resolve to branch version, indentation/tab removal and return error
on bad unimplemented Paso_FunctionCall.
paso/src/SolverFCT_solve.c - resolve to branch version, unused vars
paso/src/SparseMatrix_MatrixVector.c - resolve to branch version, unused vars.
escript/src/Utils.cpp - resloved to branch, needs WinSock2.h
escript/src/DataExpanded.cpp - resolved to branch version - LLWS
escript/src/DataFactory.cpp - resolve to branch version
=================================================================================

This currently passes tests on linux (debian), but is not checked on windows or Altix yet.

This checkin is to make a trunk I can check out for windows to do tests on it.

Known outstanding problem is in the operator=() method of exceptions
causing warning messages on the intel compilers.

May the God of doughnuts have mercy on my soul.


1 #
2 # $Id$
3 #
4 #######################################################
5 #
6 # Copyright 2003-2007 by ACceSS MNRF
7 # Copyright 2007 by University of Queensland
8 #
9 # http://esscc.uq.edu.au
10 # Primary Business: Queensland, Australia
11 # Licensed under the Open Software License version 3.0
12 # http://www.opensource.org/licenses/osl-3.0.php
13 #
14 #######################################################
15 #
16
17 import sys, os
18
19 source_root = os.path.realpath('.')
20
21 pyinstall = os.path.join(source_root,'esys')
22 incinstall = os.path.join(source_root,'include')
23 libinstall = os.path.join(source_root,'lib')
24 exinstall = os.path.join(source_root,'examples')
25
26 # locations of files for python
27 py_vers = '%s%s'%(sys.version_info[0],sys.version_info[1])
28 python_root = 'C:/python' + py_vers
29 python_cmd = os.path.join(python_root,'python')
30 python_path = os.path.join(python_root,'include')
31 python_lib_path = os.path.join(python_root,'libs')
32 python_lib = 'python' + py_vers
33
34 # locations of libraries for boost
35 dotdot = os.path.realpath('..')
36 boost_path = os.path.join(dotdot,'boost-1.33')
37 boost_lib_path = os.path.join(boost_path,'windows_binary','lib')
38 boost_lib = 'boost_python-vc71-mt-1_33_1.lib'
39
40 # locations of netcdf
41 useNetCDF = "no"
42 netCDF_path = os.path.realpath(".")
43 netCDF_lib_path = os.path.realpath(".")
44 netCDF_libs = [ ]
45
46 cc_defines = ['_USE_MATH_DEFINES', 'DLL_NETCDF', 'BOOST_NO_INTRINSIC_WCHAR_T' ]
47 # c flags to use
48 # 1563 - taking adress of a temporary
49 # 811 - exception specification for implicitly declared virtual function (destructor usually) incompatible with that of override
50 # 161 - openmp pargmas are unknown when not compiling with openmp
51 cc_common_flags = '/FD /EHsc /GR /Qvc7.1 '
52 cc_flags = cc_common_flags + '/O2 /Op /MD /W3'
53
54 cc_flags_debug = cc_common_flags + '/Od /RTC1 /MDd /ZI'
55
56 # c++ flags to use
57 cxx_flags = ''
58 cxx_flags_debug = ''
59
60 # linker flags to use
61 #link_flags = ''
62 link_flags_debug = '/debug /incremental:no /opt:ref /opt:icf'
63
64 # static library archiver flags to use
65 #ar_flags = 'crus'
66
67 # system specific libraries to link with
68 sys_libs = ["C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK/Lib/Ws2_32"]

  ViewVC Help
Powered by ViewVC 1.1.26