diff --git a/nulib2/Makefile.msc b/nulib2/Makefile.msc index f6e174a..af8caa1 100644 --- a/nulib2/Makefile.msc +++ b/nulib2/Makefile.msc @@ -8,8 +8,11 @@ # To build without debugging info, use "nmake nodebug=1". # To build with libz, use "nmake libz=1". # To build with libbz2, use "nmake libbz2=1". -# If you're linking against nufxlib as a DLL, add "DLL=1", and don't -# specify libz or libbz2. +# If you're linking against nufxlib as a DLL, you don't need to specify +# libraries. You probably need to specify DLL=1 and the same setting +# of the NODEBUG flag as you used when building the DLL. If you don't, +# "test-extract" will fail in the fwrite() call in Nu_FWrite, because +# the non-debug /MD libc does something peculiar with FILE*. # # For libz/libbz2, you need to have the appropriate library either # in this directory or in a standard location that the linker can find. @@ -19,7 +22,7 @@ TARGETOS = BOTH !include -VERSION=110 +VERSION=200 NUFXSRCDIR = ..\nufxlib-$(VERSION) # object files @@ -28,7 +31,7 @@ OBJS2 = List.obj Main.obj MiscStuff.obj MiscUtils.obj State.obj SysUtils.obj OBJS = $(OBJS1) $(OBJS2) !ifdef DLL -### build against the DLL +### build using the same libc as the DLL !ifdef NODEBUG OPT = $(cdebug) /MD LIB_FLAGS = /nodefaultlib:libcd.lib /nologo setargv.obj @@ -36,8 +39,8 @@ LIB_FLAGS = /nodefaultlib:libcd.lib /nologo setargv.obj OPT = $(cdebug) /MDd LIB_FLAGS = /nodefaultlib:libc.lib /nologo setargv.obj !endif - !else + ### build against static lib !ifdef NODEBUG OPT = $(cdebug) /ML