Changeset 7434


Ignore:
Timestamp:
05/24/18 22:18:43 (4 weeks ago)
Author:
baker
Message:

conditionally compile Fortran modules on Windows if FC is defined, e.g., set FC=ifort

Location:
trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/emake.cmd

    r1331 r7434  
    44 
    55:_WINNT_make 
    6 nmake /f Makefile.nt %1 
     6nmake /f Makefile.nt %* 
    77goto end 
    88 
    99:_OS2_make 
    10 nmake /f Makefile.os2 %1 
     10nmake /f Makefile.os2 %* 
    1111 
    1212:end 
  • trunk/environment/ew_nt.cmd

    r7375 r7434  
    4040@rem call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 
    4141 
     42@rem Set up the Fortran compilation environment 
     43@rem ------------------------------------------ 
     44 
     45@rem The default is not to compile any Fortran modules 
     46set FC= 
     47@rem To compile the Fortran modules, set FC to the Fortran compiler command 
     48 
    4249@rem Set up Intel Fortran compilation environment 
    4350@rem -------------------------------------------- 
     
    5461@rem   intel64 for 64-bit host and target, ia32_intel64 for 32-bit host and 64-bit target) 
    5562call "C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\bin\ifortvars.bat" ia32 
     63 
     64@rem Don't forget to define FC! 
     65 
     66@rem The Intel Fortran compiler command is ifort 
     67set FC=ifort 
    5668 
    5769@rem Set the path 
  • trunk/src/seismic_processing/Makefile

    r7409 r7434  
    109109 
    110110# 
    111 # List all modules to be compiled into the Windows distribution 
     111# The Windows distribution requires a helper Makefile.nt 
     112# Makefile.nt always compiles the C modules 
     113# The Fortran modules are compiled only if the FC macro (environment 
     114# variable) is defined, e.g., SET FC=ifort 
    112115# 
     116# These are for clean_nt and clean_bin_nt 
    113117NT_MODULES = \ 
    114         $(C_MODULES)  
    115 #\ 
    116 #       $(FORTRAN_MODULES) 
     118        $(C_MODULES) \ 
     119        $(FORTRAN_MODULES) 
    117120 
    118121# 
     
    172175# 
    173176nt_modules:: PHONY 
    174         @echo "Making Earthworm seismic_processing modules" 
    175         @nt_make_subdirs $(NT_MODULES) 
     177        @emake C_MODULES="$(C_MODULES)" FORTRAN_MODULES="$(FORTRAN_MODULES)" 
    176178 
    177179 
Note: See TracChangeset for help on using the changeset viewer.