stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes for windows

time-shift
Houtan Bastani 2015-03-27 17:10:00 +01:00
parent d7c253ae59
commit 90e00b3871
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -97,8 +97,6 @@ mex/build/matlab/run_m2html.m
# Preprocessor
/preprocessor/dynare_m
/preprocessor/dynare_m.exe
/preprocessor/dynare_m64
/preprocessor/dynare_m64.exe
/preprocessor/DynareBison.cc
/preprocessor/DynareBison.hh
/preprocessor/FlexLexer.h
@ -115,8 +113,7 @@ mex/build/matlab/run_m2html.m
/preprocessor/doc/
# MATLAB dir
/matlab/dynare_m
/matlab/dynare_m.exe
/matlab/preprocessor*
/matlab/dynare_version.m
# DLL rules

6
matlab/dynare.m
View File

@ -152,14 +152,14 @@ else
end
if isempty(strfind(arch, '64'))
arch_ext64 = '';
arch_ext = '32';
disp('Using 32-bit preprocessor');
else
arch_ext64 = '64';
arch_ext = '64';
disp('Using 64-bit preprocessor');
end
command = ['"' dynareroot 'dynare_m' arch_ext64 '" ' fname] ;
command = ['"' dynareroot 'preprocessor' arch_ext filesep 'dynare_m" ' fname] ;
for i=2:nargin
command = [command ' ' varargin{i-1}];
end

5
preprocessor/Makefile.am
View File

@ -70,11 +70,12 @@ DynareBison.cc DynareBison.hh location.hh stack.hh position.hh: DynareBison.yy
all-local:
if [ -z "`file $(PROGRAMS) | grep x86.64`" ]; then \
ARCH=""; \
ARCH="32"; \
else \
ARCH="64"; \
fi; \
cd ../matlab && $(LN_S) -f $(abs_srcdir)/$(PROGRAMS) $(PROGRAMS)$$ARCH
mkdir -p ../matlab/preprocessor$$ARCH ; \
cd ../matlab/preprocessor$$ARCH && $(LN_S) -f $(abs_srcdir)/$(PROGRAMS) $(PROGRAMS)
if HAVE_DOXYGEN
html-local: