exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/feature/gcc4.6port' into nextRelease

Browse source 
Conflicts:
	src/decompositionMethods/scotchDecomp/Make/options
	src/thermophysicalModels/basic/Make/options
	src/thermophysicalModels/reactionThermo/Make/options
This commit is contained in:
Henrik Rusche 2013-07-03 21:20:15 +02:00
commit a09b971def
11 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/decompositionMethods/scotchDecomp/Make/options
View file

@ -10,5 +10,6 @@ LIB_LIBS = \
else
LIB_LIBS = \
-L$(SCOTCH_LIB_DIR) -lscotch \
-L$(SCOTCH_LIB_DIR) -lscotcherrexit -lrt
-L$(SCOTCH_LIB_DIR) -lscotcherrexit \
-lrt
endif

1
src/thermophysicalModels/basic/Make/options
View file

@ -3,5 +3,4 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
LIB_LIBS = \
-lspecie \
-lfiniteVolume

3
src/thermophysicalModels/liquidMixture/Make/options
View file

@ -4,6 +4,3 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
LIB_LIBS = \
-lliquids

6
src/thermophysicalModels/liquids/Make/options
View file

@ -1,5 +1 @@
EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
LIB_LIBS = \
-lthermophysicalFunctions
EXE_INC = -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude

1
src/thermophysicalModels/reactionThermo/Make/options
View file

@ -4,5 +4,4 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
LIB_LIBS = \
-lbasicThermophysicalModels \
-lfiniteVolume

3
src/thermophysicalModels/solidMixture/Make/options
View file

@ -1,5 +1,2 @@
EXE_INC = \
-I${LIB_SRC}/thermophysicalModels/solids/lnInclude
LIB_LIBS = \
-lsolids

4
wmake/rules/SiCortex64Gcc/c++
View file

@ -18,5 +18,5 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS)
LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed

4
wmake/rules/SunOS64Gcc/c++
View file

@ -17,5 +17,5 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS)
LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed

4
wmake/rules/linuxIA64Gcc/c++
View file

@ -17,5 +17,5 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS)
LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed

4
wmake/rules/linuxPPC64Gcc/c++
View file

@ -17,5 +17,5 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS)
LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed

4
wmake/rules/solarisGcc/c++
View file

@ -17,5 +17,5 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS)
LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed