mirror of https://github.com/fadden/nulib2.git
Updated version number to 200.
Updated comments about building against the DLL.
This commit is contained in:
parent
962fc796a6
commit
8c43a1e571
|
@ -8,8 +8,11 @@
|
||||||
# To build without debugging info, use "nmake nodebug=1".
|
# To build without debugging info, use "nmake nodebug=1".
|
||||||
# To build with libz, use "nmake libz=1".
|
# To build with libz, use "nmake libz=1".
|
||||||
# To build with libbz2, use "nmake libbz2=1".
|
# To build with libbz2, use "nmake libbz2=1".
|
||||||
# If you're linking against nufxlib as a DLL, add "DLL=1", and don't
|
# If you're linking against nufxlib as a DLL, you don't need to specify
|
||||||
# specify libz or libbz2.
|
# 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
|
# For libz/libbz2, you need to have the appropriate library either
|
||||||
# in this directory or in a standard location that the linker can find.
|
# in this directory or in a standard location that the linker can find.
|
||||||
|
@ -19,7 +22,7 @@
|
||||||
TARGETOS = BOTH
|
TARGETOS = BOTH
|
||||||
!include <ntwin32.mak>
|
!include <ntwin32.mak>
|
||||||
|
|
||||||
VERSION=110
|
VERSION=200
|
||||||
NUFXSRCDIR = ..\nufxlib-$(VERSION)
|
NUFXSRCDIR = ..\nufxlib-$(VERSION)
|
||||||
|
|
||||||
# object files
|
# object files
|
||||||
|
@ -28,7 +31,7 @@ OBJS2 = List.obj Main.obj MiscStuff.obj MiscUtils.obj State.obj SysUtils.obj
|
||||||
OBJS = $(OBJS1) $(OBJS2)
|
OBJS = $(OBJS1) $(OBJS2)
|
||||||
|
|
||||||
!ifdef DLL
|
!ifdef DLL
|
||||||
### build against the DLL
|
### build using the same libc as the DLL
|
||||||
!ifdef NODEBUG
|
!ifdef NODEBUG
|
||||||
OPT = $(cdebug) /MD
|
OPT = $(cdebug) /MD
|
||||||
LIB_FLAGS = /nodefaultlib:libcd.lib /nologo setargv.obj
|
LIB_FLAGS = /nodefaultlib:libcd.lib /nologo setargv.obj
|
||||||
|
@ -36,8 +39,8 @@ LIB_FLAGS = /nodefaultlib:libcd.lib /nologo setargv.obj
|
||||||
OPT = $(cdebug) /MDd
|
OPT = $(cdebug) /MDd
|
||||||
LIB_FLAGS = /nodefaultlib:libc.lib /nologo setargv.obj
|
LIB_FLAGS = /nodefaultlib:libc.lib /nologo setargv.obj
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
!else
|
!else
|
||||||
|
|
||||||
### build against static lib
|
### build against static lib
|
||||||
!ifdef NODEBUG
|
!ifdef NODEBUG
|
||||||
OPT = $(cdebug) /ML
|
OPT = $(cdebug) /ML
|
||||||
|
|
Loading…
Reference in New Issue