/[escript]/branches/domexper/scons/windows_mscv71_options.py
ViewVC logotype

Annotation of /branches/domexper/scons/windows_mscv71_options.py

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1628 - (hide annotations)
Fri Jul 11 13:12:46 2008 UTC (10 years, 11 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File MIME type: text/x-python
File size: 2134 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 ksteube 1312 #
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 phornby 1628 import sys, os
18 phornby 1232
19 phornby 1241 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 phornby 1628 # 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 phornby 1241 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 phornby 1628 python_lib = 'python' + py_vers
33 phornby 1017
34     # locations of libraries for boost
35 trankine 1427 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 phornby 1628 boost_lib = 'boost_python-vc71-mt-1_33_1.lib'
39 phornby 1017
40     # locations of netcdf
41 trankine 1427 useNetCDF = "no"
42     netCDF_path = os.path.realpath(".")
43     netCDF_lib_path = os.path.realpath(".")
44     netCDF_libs = [ ]
45 phornby 1017
46 trankine 1427 cc_defines = ['_USE_MATH_DEFINES']
47 phornby 1017 # 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 phornby 1132 cc_common_flags = '/FD /EHsc /GR /wd4068 '
52 phornby 1628 cc_flags = cc_common_flags + '/O2 /Op /MD /W3'
53 phornby 1017
54 phornby 1628 cc_flags_debug = cc_common_flags + '/Od /RTC1 /MDd /ZI /Yd /Y-'
55 phornby 1017
56     # c++ flags to use
57     cxx_flags = ''
58     cxx_flags_debug = ''
59 phornby 1628
60     # linker flags to use
61     #link_flags = ''
62     link_flags_debug = '/debug /incremental:no /opt:ref /opt:icf'
63    
64 phornby 1017 # static library archiver flags to use
65     #ar_flags = 'crus'
66    
67     # system specific libraries to link with
68 phornby 1628 sys_libs = ["C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK/Lib/Ws2_32"]

  ViewVC Help
Powered by ViewVC 1.1.26