Commit 20747649 authored by george's avatar george
Browse files

Linux Makefiles and some linux syntax adjustments

git-svn-id: https://www.dynare.org/svn/dynare/trunk@2846 ac1d8469-bf42-47a9-8791-bf33cf982152
parent 9341a9bf
......@@ -5,8 +5,8 @@
LD_LIBS := -llapack -lcblas -lf77blas -latlas -lg2c
CC_FLAGS := -DMATLAB -DWINDOWS -DNO_BLAS_H -DNO_LAPACK_H \
-Wall -I../sylv/cc \
-Ic:/"Program Files"/MATLAB_SV71/extern/include #-pg
-fpic -Wall -I../sylv/cc \
-I$(MATLAB_PATH)/extern/include #-pg
ifeq ($(DEBUG),yes)
CC_FLAGS := -DDEBUG $(CC_FLAGS) -g
......@@ -17,8 +17,7 @@ endif
# Added by GP
# LDFLAGS := -llapack -lcblas -lf77blas -latlas -lg2c -lstdc++ -lmingw32
LDFLAGS := -Wl,--library-path $(LD_LIBRARY_PATH) \
-Wl,-L'f:/MinGW/lib' \
-Wl,-L"c:/Program Files"/MATLAB_SV71/extern/lib/win32/microsoft/ \
-Wl,-L$(MATLAB_PATH)/extern/lib/win32/microsoft/ \
-Wl,-llibmex -Wl,-llibmx -Wl,-llibmwlapack -Wl,-llibdflapack \
-lg2c -lmingw32 -lstdc++ $(LDFLAGS)
......
......@@ -167,7 +167,7 @@ struct SSForm{
SSForm(const GeneralMatrix&zz,const GeneralMatrix&hh,
const GeneralMatrix&tt,const GeneralMatrix&rr,
const GeneralMatrix&qq);
SSForm::SSForm(const SSForm&f);
SSForm(const SSForm&f);
~SSForm();
};
......
# $Id: Makefile 531 2005-11-30 13:49:48Z kamenik $
# Copyright 2005, Ondra Kamenik
#DEBUG = yes
DEBUG = yes
#LD_LIBS := -llapack -lcblas -lf77blas -latlas -lg2c
CC_FLAGS := -DMATLAB -DWINDOWS -DNO_BLAS_H -DNO_LAPACK_H \
-Wall -mno-cygwin -I../qt/cc -I../sylv/cc -I../cc \
-Ic:/"Program Files"/MATLAB_SV71/extern/include #-pg
#CC_FLAGS := -DWINDOWS -mno-cygwin
CC_FLAGS := -DMATLAB -DNO_BLAS_H -DNO_LAPACK_H \
-Wall -fpic -I../qt/cc -I../sylv/cc -I../cc \
-I$(MATLAB_PATH)/extern/include #-pg
ifeq ($(DEBUG),yes)
CC_FLAGS := -DDEBUG $(CC_FLAGS) -g
......@@ -22,14 +24,19 @@ endif
# Added by GP
# LDFLAGS := -llapack -lcblas -lf77blas -latlas -lg2c -lstdc++ -lmingw32
#LDFLAG := -Wl,--library-path $(LD_LIBRARY_PATH)
LD_LIBS := -Wl,--library-path \
-Wl,-L'f:/CygWin/lib' \
-Wl,-L"c:/Program Files"/MATLAB_SV71/extern/lib/win32/microsoft/ \
-Wl,-llibmex -Wl,-llibmx -Wl,-llibmwlapack -Wl,-llibdflapack \
-lf95 -lg2c -lmingw32 -lstdc++ $(LDFLAGS) \
-Wl,-L'C:/MinGW/lib/gcc-lib/i686-pc-mingw32/4.0.4' \
-Wl,-L'C:/MinGW/lib' kalmanlib.def
#-Wl,-L'C:/MinGW/lib/gcc-lib/i686-pc-mingw32/4.0.4'
#-Wl,-llibmex -Wl,-llibmx -Wl,-llibmwlapack -Wl,-llibdflapack -lf95
#-lg2c -lmingw32 kalmanlib.def -Wl,-lmwm_ir
#-Wl,-L'f:/CygWin/lib'
#LD_LIBS := -Wl,--library-path
# -Wl,-L'/usr/lib'
LD_LIBS := -Wl,-rpath-link,$(MATLAB_PATH)/bin/glnxa64 \
-Wl,-L$(MATLAB_PATH)/bin/glnxa64 \
-Wl,-lmex -lmx -lmwlapack -lmwblas -lmat -lm \
-Wl,-lstdc++ $(LDFLAGS)
#-Wl,-L'/usr/lib'
# -Wl,-L'f:/CygWin/usr/local/atlas/lib'
# -Wl,-L'f:/CygWin/lib'
......@@ -103,8 +110,8 @@ kalman_filters_testx.exe: kalman_filters_testx.o $(KALMANLIB) # $(hsource) $(cpp
all: $(objects) $(KALMANLIB) kalman_smoother_dll.dll kalman_filter_dll.dll # $(cppsource) $(hsource) $(kalmanhsource) $(kalmancppsource)
kalman_filter_loop.o: kalman_filters.cpp
c++ -DTIMING_LOOP $(CC_FLAGS) -o kalman_filter_loop.o kalman_filters.cpp
#kalman_filter_loop.o: kalman_filters.cpp
# c++ -DTIMING_LOOP $(CC_FLAGS) -o kalman_filter_loop.o kalman_filters.cpp
#kalman_filter_loop.dll: kalman_filter_loop.o kalmanlib.a # $(hsource) $(cppsource)
# gcc -shared -DTIMING_LOOP $(CC_FLAGS) -o kalman_filter_loop.dll kalman_filter_loop.o \
......
......@@ -123,7 +123,7 @@ extern "C" {
if (nhls >= 6) {
int dims[3]; dims[0] = T.numRows();
dims[1] = T.numRows(); dims[2] = Y.numCols();
plhs[5] = mxCreateNumericArray(3, dims, mxDOUBLE_CLASS, mxREAL);
plhs[5] = mxCreateNumericMatrix(3, dims[0], mxDOUBLE_CLASS, mxREAL);
if (per == Y.numCols()) {
GeneralMatrix tmp(mxGetPr(plhs[5]), T.numRows(),
T.numRows()*Y.numCols());
......
# $Header: /var/lib/cvs/dynare_cpp/sylv/cc/Makefile,v 1.4 2005/01/18 21:28:26 kamenik Exp $
# Tag $Name: $
FF=f95
CC_FLAGS := -Wall -Winline -fpic
#CC_FLAGS := -Wall -Winline -I../testing -I../cc -DMATLAB \
# $(CC_INCLUDE_PATH) -I$(MATLAB_PATH)/extern/include #-pg
LDFLAGS = -Wl,-L$(MATLAB_PATH)/extern/lib/win32/microsoft/ \
-Wl,-llibmex -Wl,-llibmx -Wl,-llibmwlapack -Wl,-llibdflapack \
-lg2c -lmingw32 -lstdc++
LD_LIBS=$(LDFLAGS)
ifeq ($(DEBUG),yes)
# CC_FLAGS := $(CC_FLAGS) -g -DTL_DEBUG=2
CC_FLAGS := $(CC_FLAGS) -g -DPOSIX_THREADS
else
CC_FLAGS := $(CC_FLAGS) -O3
endif
ifeq ($(OS),Windows_NT)
CC_FLAGS := -mno-cygwin -mthreads $(CC_FLAGS)
endif
objects := $(patsubst %.f90,%.o,$(wildcard *.f90))
all: $(objects)
clear:
rm -f *.o
%.o : %.f90
$(FF) $(CC_FLAGS) $(EXTERN_DEFS) -c $*.f90
......@@ -2,10 +2,10 @@
# Tag $Name: $
CC_FLAGS := -Wall -Winline -I../testing -I../cc -DMATLAB \
$(CC_INCLUDE_PATH) -Ic:/"Program Files"/MATLAB_SV71/extern/include #-pg
CC_FLAGS := -Wall -Winline -fpic -I../testing -I../cc -DMATLAB \
$(CC_INCLUDE_PATH) -I$(MATLAB)/extern/include #-pg
LDFLAGS = -Wl,-L"c:/Program Files"/MATLAB_SV71/extern/lib/win32/microsoft/ \
LDFLAGS = -Wl,-L$(MATLAB_PATH)/extern/lib/win32/microsoft/ \
-Wl,-llibmex -Wl,-llibmx -Wl,-llibmwlapack -Wl,-llibdflapack \
-lg2c -lmingw32 -lstdc++
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment