Changeset 7945


Ignore:
Timestamp:
03/16/19 02:47:51 (8 days ago)
Author:
baker
Message:

finish some makefile.nt edits that got missed

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/data_sources/adsendxs/makefile.nt

    r7918 r7945  
    66!include <ntwin32.mak> 
    77 
    8 CFLAGS  = $(cflags)    $(cdebug) $(cvarsmt)   $(GLOBALFLAGS) 
     8CFLAGS  = $(cflags)    $(cdebug) $(cvarsmt)   $(GLOBALFLAGS) \ 
     9                /DWIN32 /I$(NIDAQ_INCLUDE) /wd4005 
    910LDFLAGS = $(conlflags) $(ldebug) $(conlibsmt) 
    1011 
    1112B = $(EW_HOME)\$(EW_VERSION)\bin 
    1213L = $(EW_HOME)\$(EW_VERSION)\lib 
     14 
     15# 
     16# Set up paths for NI-DAQmx 9.2: 
     17# 
     18NIDAQ_INCLUDE = "C:\Program Files\National Instruments\NI-DAQ\DAQmx ANSI C Dev\Include" 
     19NIDAQ_LIB     = "C:\Program Files\National Instruments\NI-DAQ\DAQmx ANSI C Dev\Lib\msvc" 
    1320 
    1421APP = adsendxs 
     
    2431        setpcclock.obj 
    2532 
    26 # 
    27 # Set up paths for NI-DAQmx 9.2: 
    28 # 
    29 NIDAQ_INCLUDE="c:\Program Files\National Instruments\NI-DAQ\DAQmx ANSI C Dev\Include" 
    30 NIDAQ_LIB="c:\Program Files\National Instruments\NI-DAQ\DAQmx ANSI C Dev\Lib\msvc" 
     33EW_LIBS = \ 
     34        /LIBPATH:$L \ 
     35        $L\swap.obj \ 
     36        $L\libew_mt.lib 
    3137 
    32 compflags=/c /DWIN32 /I$(NIDAQ_INCLUDE) $(cflags) /wd4005 
    33 linkflags=/MACHINE:I386 
    34  
    35 adsendxs.exe: $O 
    36         link $(linkflags) /OUT:$B\adsendxs.exe $O \ 
    37         $L\libew_mt.lib $L\swap.obj \ 
    38         $(NIDAQ_LIB)\nidaqmx.lib 
     38$B\$(APP).exe: $(OBJS) 
     39        $(link) /out:$@ $(LDFLAGS) $(OBJS) /LIBPATH:$(NIDAQ_LIB) nidaqmx.lib $(EW_LIBS) 
    3940 
    4041 
  • trunk/src/data_sources/srusb2ew/makefile.nt

    r7935 r7945  
    3535        SrUsbXch.obj 
    3636 
    37 EW_LIBS = $L\libew_mt.lib 
     37EW_LIBS = /LIBPATH:$L libew_mt.lib 
    3838 
    3939$B\$(APP).exe: $(OBJS) 
  • trunk/src/libsrc/libgd/makefile.nt

    r7905 r7945  
    2222EW_LIBS = /LIBPATH:$L libgd.lib 
    2323 
    24 all: $L\libgd.lib $B\gddemo.exe $B\giftogd.exe $B\webgif.exe 
     24all:    $L\libgd.lib \ 
     25        $B\gddemo.exe \ 
     26        $B\giftogd.exe \ 
     27        $B\webgif.exe 
    2528 
    2629$L\libgd.lib: $(OBJS) 
  • trunk/src/libsrc/makefile.nt

    r7905 r7945  
    3838        winnt\threads_ew.obj 
    3939 
    40 #all: $(NT_MODULES) $L\libew.lib $L\libew_mt.lib 
    41 all: $(NT_MODULES) $L\libew_mt.lib 
     40#all:   $(NT_MODULES) \ 
     41#       $L\libew.lib \ 
     42#       $L\libew_mt.lib 
     43all:    $(NT_MODULES) \ 
     44        $L\libew_mt.lib 
    4245 
    4346earlybird \ 
Note: See TracChangeset for help on using the changeset viewer.