Fix Win32 build

This replaces the old makefiles, and corrects the symbol test
from WIN32 to _WIN32.
This commit is contained in:
Andy McFadden 2014-10-29 15:14:14 -07:00
parent 8f1bea0a47
commit 5e44597d05
6 changed files with 209 additions and 964 deletions

8
.gitignore vendored
View File

@ -1,3 +1,11 @@
autom4te.cache
*.o
*.obj
*.a
*.lib
*.dll
*.exe
*.exp
*.pdb
*~
*.swp

View File

@ -1,794 +0,0 @@
#
# Makefile for building nufxlib as a DLL under Visual C++ (tested with 6.0).
#
# Run with "nmake /f Makefile.dll".
#
# 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".
#
# Output is nufxlib2.dll/nufxlib2.lib for the "release" version, and
# nufxlib2D.dll/nufxlib2D.lib for the "debug" version. It's important
# to keep this separate because the "debug" version links against
# msvcrtd.dll, which non-developer systems won't have.
#
# For libz/libbz2, you need to have the appropriate library either
# in this directory or in a standard location that the linker can find
#
CFG=nufxlib - Win32 Debug
MY_BUILD_FLAGS=/D "DEBUG_MSGS"
!ifdef NODEBUG
CFG=nufxlib - Win32 Release
#MY_BUILD_FLAGS=/D "NDEBUG"
MY_BUILD_FLAGS=
!endif
MY_LIB_FLAGS=
!ifdef LIBZ
MY_BUILD_FLAGS = $(MY_BUILD_FLAGS) /D "ENABLE_DEFLATE" /D "ZLIB_DLL"
MY_LIB_FLAGS = zlib.lib $(MY_LIB_FLAGS)
!endif
!ifdef LIBBZ2
MY_BUILD_FLAGS = $(MY_BUILD_FLAGS) /D "ENABLE_BZIP2"
MY_LIB_FLAGS = libbz2.lib $(MY_LIB_FLAGS)
!endif
# Microsoft Developer Studio Generated NMAKE File, Based on nufxlib.dsp
!IF "$(CFG)" == ""
CFG=nufxlib - Win32 Debug
!MESSAGE No configuration specified. Defaulting to nufxlib - Win32 Debug.
!ENDIF
!IF "$(CFG)" != "nufxlib - Win32 Release" && "$(CFG)" != "nufxlib - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "nufxlib.mak" CFG="nufxlib - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "nufxlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "nufxlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
!IF "$(CFG)" == "nufxlib - Win32 Release"
OUTDIR=.\Release
INTDIR=.\Release
# Begin Custom Macros
OutDir=.\Release
# End Custom Macros
MY_LIB_FLAGS = /nodefaultlib:libc.lib $(MY_LIB_FLAGS)
ALL : "$(OUTDIR)\nufxlib2.dll"
CLEAN :
-@erase "$(INTDIR)\Archive.obj"
-@erase "$(INTDIR)\ArchiveIO.obj"
-@erase "$(INTDIR)\Bzip2.obj"
-@erase "$(INTDIR)\Compress.obj"
-@erase "$(INTDIR)\Crc16.obj"
-@erase "$(INTDIR)\Debug.obj"
-@erase "$(INTDIR)\Deferred.obj"
-@erase "$(INTDIR)\Deflate.obj"
-@erase "$(INTDIR)\Entry.obj"
-@erase "$(INTDIR)\Expand.obj"
-@erase "$(INTDIR)\FileIO.obj"
-@erase "$(INTDIR)\Funnel.obj"
-@erase "$(INTDIR)\Lzc.obj"
-@erase "$(INTDIR)\Lzw.obj"
-@erase "$(INTDIR)\MiscStuff.obj"
-@erase "$(INTDIR)\MiscUtils.obj"
-@erase "$(INTDIR)\Record.obj"
-@erase "$(INTDIR)\SourceSink.obj"
-@erase "$(INTDIR)\Squeeze.obj"
-@erase "$(INTDIR)\Thread.obj"
-@erase "$(INTDIR)\Value.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\Version.obj"
-@erase "$(OUTDIR)\nufxlib2.dll"
-@erase "$(OUTDIR)\nufxlib2.exp"
-@erase "$(OUTDIR)\nufxlib2.lib"
-@erase "Version.c"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NUFXLIB_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c $(MY_BUILD_FLAGS)
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
MTL=midl.exe
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\nufxlib.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(MY_LIB_FLAGS) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\nufxlib.pdb" /machine:I386 /out:"$(OUTDIR)\nufxlib2.dll" /implib:"$(OUTDIR)\nufxlib2.lib"
LINK32_OBJS= \
"$(INTDIR)\Archive.obj" \
"$(INTDIR)\ArchiveIO.obj" \
"$(INTDIR)\Bzip2.obj" \
"$(INTDIR)\Compress.obj" \
"$(INTDIR)\Crc16.obj" \
"$(INTDIR)\Debug.obj" \
"$(INTDIR)\Deferred.obj" \
"$(INTDIR)\Deflate.obj" \
"$(INTDIR)\Entry.obj" \
"$(INTDIR)\Expand.obj" \
"$(INTDIR)\FileIO.obj" \
"$(INTDIR)\Funnel.obj" \
"$(INTDIR)\Lzc.obj" \
"$(INTDIR)\Lzw.obj" \
"$(INTDIR)\MiscStuff.obj" \
"$(INTDIR)\MiscUtils.obj" \
"$(INTDIR)\Record.obj" \
"$(INTDIR)\SourceSink.obj" \
"$(INTDIR)\Squeeze.obj" \
"$(INTDIR)\Thread.obj" \
"$(INTDIR)\Value.obj" \
"$(INTDIR)\Version.obj"
"$(OUTDIR)\nufxlib2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
SOURCE="$(InputPath)"
DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
ALL : $(DS_POSTBUILD_DEP)
# Begin Custom Macros
OutDir=.\Release
# End Custom Macros
$(DS_POSTBUILD_DEP) : "$(OUTDIR)\nufxlib2.dll"
copy Release\nufxlib2.dll .
copy Release\nufxlib2.lib .
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
OUTDIR=.\Debug
INTDIR=.\Debug
# Begin Custom Macros
OutDir=.\Debug
# End Custom Macros
MY_LIB_FLAGS = /nodefaultlib:libcd.lib $(MY_LIB_FLAGS)
ALL : "$(OUTDIR)\nufxlib2D.dll" "$(OUTDIR)\nufxlib.bsc"
CLEAN :
-@erase "$(INTDIR)\Archive.obj"
-@erase "$(INTDIR)\Archive.sbr"
-@erase "$(INTDIR)\ArchiveIO.obj"
-@erase "$(INTDIR)\ArchiveIO.sbr"
-@erase "$(INTDIR)\Bzip2.obj"
-@erase "$(INTDIR)\Bzip2.sbr"
-@erase "$(INTDIR)\Compress.obj"
-@erase "$(INTDIR)\Compress.sbr"
-@erase "$(INTDIR)\Crc16.obj"
-@erase "$(INTDIR)\Crc16.sbr"
-@erase "$(INTDIR)\Debug.obj"
-@erase "$(INTDIR)\Debug.sbr"
-@erase "$(INTDIR)\Deferred.obj"
-@erase "$(INTDIR)\Deferred.sbr"
-@erase "$(INTDIR)\Deflate.obj"
-@erase "$(INTDIR)\Deflate.sbr"
-@erase "$(INTDIR)\Entry.obj"
-@erase "$(INTDIR)\Entry.sbr"
-@erase "$(INTDIR)\Expand.obj"
-@erase "$(INTDIR)\Expand.sbr"
-@erase "$(INTDIR)\FileIO.obj"
-@erase "$(INTDIR)\FileIO.sbr"
-@erase "$(INTDIR)\Funnel.obj"
-@erase "$(INTDIR)\Funnel.sbr"
-@erase "$(INTDIR)\Lzc.obj"
-@erase "$(INTDIR)\Lzc.sbr"
-@erase "$(INTDIR)\Lzw.obj"
-@erase "$(INTDIR)\Lzw.sbr"
-@erase "$(INTDIR)\MiscStuff.obj"
-@erase "$(INTDIR)\MiscStuff.sbr"
-@erase "$(INTDIR)\MiscUtils.obj"
-@erase "$(INTDIR)\MiscUtils.sbr"
-@erase "$(INTDIR)\Record.obj"
-@erase "$(INTDIR)\Record.sbr"
-@erase "$(INTDIR)\SourceSink.obj"
-@erase "$(INTDIR)\SourceSink.sbr"
-@erase "$(INTDIR)\Squeeze.obj"
-@erase "$(INTDIR)\Squeeze.sbr"
-@erase "$(INTDIR)\Thread.obj"
-@erase "$(INTDIR)\Thread.sbr"
-@erase "$(INTDIR)\Value.obj"
-@erase "$(INTDIR)\Value.sbr"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\vc60.pdb"
-@erase "$(INTDIR)\Version.obj"
-@erase "$(INTDIR)\Version.sbr"
-@erase "$(OUTDIR)\nufxlib.bsc"
-@erase "$(OUTDIR)\nufxlib2D.dll"
-@erase "$(OUTDIR)\nufxlib2D.exp"
-@erase "$(OUTDIR)\nufxlib2D.ilk"
-@erase "$(OUTDIR)\nufxlib2D.lib"
-@erase "$(OUTDIR)\nufxlib.pdb"
-@erase "Version.c"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NUFXLIB_EXPORTS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c $(MY_BUILD_FLAGS)
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
MTL=midl.exe
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\nufxlib.bsc"
BSC32_SBRS= \
"$(INTDIR)\Archive.sbr" \
"$(INTDIR)\ArchiveIO.sbr" \
"$(INTDIR)\Bzip2.sbr" \
"$(INTDIR)\Compress.sbr" \
"$(INTDIR)\Crc16.sbr" \
"$(INTDIR)\Debug.sbr" \
"$(INTDIR)\Deferred.sbr" \
"$(INTDIR)\Deflate.sbr" \
"$(INTDIR)\Entry.sbr" \
"$(INTDIR)\Expand.sbr" \
"$(INTDIR)\FileIO.sbr" \
"$(INTDIR)\Funnel.sbr" \
"$(INTDIR)\Lzc.sbr" \
"$(INTDIR)\Lzw.sbr" \
"$(INTDIR)\MiscStuff.sbr" \
"$(INTDIR)\MiscUtils.sbr" \
"$(INTDIR)\Record.sbr" \
"$(INTDIR)\SourceSink.sbr" \
"$(INTDIR)\Squeeze.sbr" \
"$(INTDIR)\Thread.sbr" \
"$(INTDIR)\Value.sbr" \
"$(INTDIR)\Version.sbr"
"$(OUTDIR)\nufxlib.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
$(BSC32) @<<
$(BSC32_FLAGS) $(BSC32_SBRS)
<<
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(MY_LIB_FLAGS) /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\nufxlib.pdb" /debug /machine:I386 /out:"$(OUTDIR)\nufxlib2D.dll" /implib:"$(OUTDIR)\nufxlib2D.lib" /pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\Archive.obj" \
"$(INTDIR)\ArchiveIO.obj" \
"$(INTDIR)\Bzip2.obj" \
"$(INTDIR)\Compress.obj" \
"$(INTDIR)\Crc16.obj" \
"$(INTDIR)\Debug.obj" \
"$(INTDIR)\Deferred.obj" \
"$(INTDIR)\Deflate.obj" \
"$(INTDIR)\Entry.obj" \
"$(INTDIR)\Expand.obj" \
"$(INTDIR)\FileIO.obj" \
"$(INTDIR)\Funnel.obj" \
"$(INTDIR)\Lzc.obj" \
"$(INTDIR)\Lzw.obj" \
"$(INTDIR)\MiscStuff.obj" \
"$(INTDIR)\MiscUtils.obj" \
"$(INTDIR)\Record.obj" \
"$(INTDIR)\SourceSink.obj" \
"$(INTDIR)\Squeeze.obj" \
"$(INTDIR)\Thread.obj" \
"$(INTDIR)\Value.obj" \
"$(INTDIR)\Version.obj"
"$(OUTDIR)\nufxlib2D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
SOURCE="$(InputPath)"
DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
ALL : $(DS_POSTBUILD_DEP)
# Begin Custom Macros
OutDir=.\Debug
# End Custom Macros
$(DS_POSTBUILD_DEP) : "$(OUTDIR)\nufxlib2D.dll" "$(OUTDIR)\nufxlib.bsc"
copy Debug\nufxlib2D.dll .
copy Debug\nufxlib2D.lib .
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ENDIF
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("nufxlib.dep")
!INCLUDE "nufxlib.dep"
!ELSE
!MESSAGE Warning: cannot find "nufxlib.dep"
!ENDIF
!ENDIF
!IF "$(CFG)" == "nufxlib - Win32 Release" || "$(CFG)" == "nufxlib - Win32 Debug"
SOURCE="Archive.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Archive.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Archive.obj" "$(INTDIR)\Archive.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="ArchiveIO.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\ArchiveIO.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\ArchiveIO.obj" "$(INTDIR)\ArchiveIO.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Bzip2.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Bzip2.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Bzip2.obj" "$(INTDIR)\Bzip2.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Compress.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Compress.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Compress.obj" "$(INTDIR)\Compress.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Crc16.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Crc16.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Crc16.obj" "$(INTDIR)\Crc16.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Debug.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Debug.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Debug.obj" "$(INTDIR)\Debug.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Deferred.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Deferred.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Deferred.obj" "$(INTDIR)\Deferred.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Deflate.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Deflate.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Deflate.obj" "$(INTDIR)\Deflate.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Entry.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Entry.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Entry.obj" "$(INTDIR)\Entry.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Expand.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Expand.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Expand.obj" "$(INTDIR)\Expand.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="FileIO.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\FileIO.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\FileIO.obj" "$(INTDIR)\FileIO.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Funnel.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Funnel.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Funnel.obj" "$(INTDIR)\Funnel.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Lzc.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Lzc.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Lzc.obj" "$(INTDIR)\Lzc.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Lzw.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Lzw.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Lzw.obj" "$(INTDIR)\Lzw.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="MiscStuff.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\MiscStuff.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\MiscStuff.obj" "$(INTDIR)\MiscStuff.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="MiscUtils.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\MiscUtils.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\MiscUtils.obj" "$(INTDIR)\MiscUtils.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Record.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Record.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Record.obj" "$(INTDIR)\Record.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="SourceSink.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\SourceSink.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\SourceSink.obj" "$(INTDIR)\SourceSink.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Squeeze.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Squeeze.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Squeeze.obj" "$(INTDIR)\Squeeze.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Thread.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Thread.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Thread.obj" "$(INTDIR)\Thread.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Value.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Value.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Value.obj" "$(INTDIR)\Value.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE="Version.c"
!IF "$(CFG)" == "nufxlib - Win32 Release"
"$(INTDIR)\Version.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "nufxlib - Win32 Debug"
"$(INTDIR)\Version.obj" "$(INTDIR)\Version.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
# this isn't great, but it'll have to do
SOURCE="Version.c.in"
Version.c: Version.c.in
copy Version.c.in Version.c
@echo -
@echo - NOTE: you must update Version.c by hand
@echo -
!ENDIF

View File

@ -1,104 +1,152 @@
# Makefile for NufxLib using Microsoft Visual C++. This builds the library
# as a static lib and as a DLL, and builds all samples. The test-basic
# sample is built twice, once with the static lib, and once with the DLL.
#
# Makefile for Microsoft C compilers. Tested against Visual C++ 6.0.
# Not pretty but it seems to work.
# Tested with VS 2013 Pro.
#
# Run with "nmake /f Makefile.msc".
# If you're including zlib support, place copies of zlib.h, zconf.h,
# and the zlib library in this directory.
#
# 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".
#
# For libz/libbz2, you need to have the appropriate header file(s) either
# in this directory or in a standard location that the compiler can find.
# Adapted from zlib's Makefile.msc.
#
!ifdef DLL
ERROR -- use makefile.dll to build the DLL
TOP = .
STATICLIB = nufxlib2.lib
SHAREDLIB = nufxlib2.dll
IMPLIB = nufxdll.lib
CC = cl
LD = link
AR = lib
# C compiler flags
# -Fd: rename PDB file from "VCx0.pdb" (where 'x' is the version number);
# allows DLL debug info to be separate from app debug info
# -Ox: full optimization
# -Oy-: disable frame pointer omission (for easier debugging)
# -MD: create a multithreaded DLL using MSVCRT.lib; alternatively,
# use -MDd to create a debug executable with MSVCRTD.lib
# -nologo: suppress display of copyright banner
# -W3: set warning level to 3 (all production-level warnings)
# -Zi: generate a PDB file with full debugging info
#
# The OPTFLAGSTR define is used by Version.c to show how the library was
# built. Defining NUFXLIB_EXPORTS enables the __declspec(dllexport)
# macros that are required for creating the DLL.
OPTFLAGS = -Ox -Oy-
CFLAGS = -nologo -MD -W3 $(OPTFLAGS) -Zi -Fd"nufxlib" \
-DOPTFLAGSTR="\"$(OPTFLAGS)\"" -DNUFXLIB_EXPORTS
# Warning suppression flags
WFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
# Linker flags
# -debug: creates debugging info for EXE or DLL in PDB file
# -incremental:no: disable incremental linking, making the resulting library
# a tad smaller
# -nologo: suppress display of copyright banner
# -opt:ref: eliminates unreferenced functions and data (default for non-debug
# builds, but we've enabled debug info)
LDFLAGS = -nologo -debug -incremental:no -opt:ref
# Library creator flags
ARFLAGS = -nologo
ZLIB=1
!ifdef ZLIB
# enable deflate support; requires zlib
CFLAGS = $(CFLAGS) -DENABLE_DEFLATE
LDFLAGS = $(LDFLAGS) zlib.lib
!endif
# Windows magic
TARGETOS = BOTH
!include <ntwin32.mak>
# object files
OBJS1 = Archive.obj ArchiveIO.obj Bzip2.obj Compress.obj Crc16.obj Debug.obj
OBJS2 = Deferred.obj Deflate.obj Entry.obj Expand.obj FileIO.obj Funnel.obj
OBJS3 = Lzc.obj Lzw.obj MiscStuff.obj MiscUtils.obj Record.obj SourceSink.obj
OBJS4 = Squeeze.obj Thread.obj Value.obj Version.obj
OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4)
!ifdef NODEBUG
#OPT = $(cdebug) /D NDEBUG /ML /O2
OPT = $(cdebug) /ML /O2
!else
#OPT = $(cdebug) /MLd /Od
OPT = $(cdebug) /D DEBUG_MSGS /MLd /Od
!endif
BUILD_FLAGS = /W3 /GX /D "WIN32"
!ifdef LIBZ
BUILD_FLAGS = $(BUILD_FLAGS) /D "ENABLE_DEFLATE"
!endif
!ifdef LIBBZ2
BUILD_FLAGS = $(BUILD_FLAGS) /D "ENABLE_BZIP2"
!endif
# how to compile sources
.c.obj:
@$(cc) $(OPT) $(BUILD_FLAGS) $(cflags) $(cvars) -o $@ $<
OBJS = Archive.obj ArchiveIO.obj Bzip2.obj Compress.obj Crc16.obj Debug.obj \
Deferred.obj Deflate.obj Entry.obj Expand.obj FileIO.obj Funnel.obj \
Lzc.obj Lzw.obj MiscStuff.obj MiscUtils.obj Record.obj SourceSink.obj \
Squeeze.obj Thread.obj Value.obj Version.obj
PRODUCT = nufxlib2.lib
# build targets -- static library, dynamic library, and test programs
all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \
exerciser.exe imgconv.exe launder.exe test-basic.exe \
test-basic-d.exe test-extract.exe test-simple.exe test-twirl.exe
all: $(PRODUCT) samples
clean:
-del *.obj *.pdb *.exp
-del $(STATICLIB) $(SHAREDLIB) $(IMPLIB)
samples::
@echo -
@echo - Change to the samples directory and run $(MAKE) there.
!ifdef LIBZ
@echo - Remember to specify libz=1
!endif
!ifdef LIBBZ
@echo - Remember to specify libbz2=1
!endif
@echo -
$(STATICLIB): $(OBJS)
$(AR) $(ARFLAGS) -out:$@ $(OBJS)
# this isn't great, but it'll have to do
Version.c: Version.c.in
copy Version.c.in Version.c
@echo -
@echo - NOTE: you must update Version.c by hand (use flags=$(OPT))
@echo -
$(IMPLIB): $(SHAREDLIB)
nufxlib2.lib: $(OBJS)
if exist $(PRODUCT) del $(PRODUCT)
$(link) -lib /out:$(PRODUCT) $(OBJS) /nologo
$(SHAREDLIB): $(OBJS)
$(LD) $(LDFLAGS) -dll -implib:$(IMPLIB) -out:$@ $(OBJS)
clean::
-del *.obj
-del $(PRODUCT)
exerciser.exe: Exerciser.obj $(STATICLIB)
$(LD) $(LDFLAGS) -out:$@ Exerciser.obj $(STATICLIB)
Archive.obj: Archive.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
ArchiveIO.obj: ArchiveIO.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Bzip2.obj: Bzip2.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Compress.obj: Compress.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Crc16.obj: Crc16.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Debug.obj: Debug.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Deferred.obj: Deferred.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Deflate.obj: Deflate.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Entry.obj: Entry.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Expand.obj: Expand.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
FileIO.obj: FileIO.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Funnel.obj: Funnel.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Lzc.obj: Lzc.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Lzw.obj: Lzw.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
MiscStuff.obj: MiscStuff.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
MiscUtils.obj: MiscUtils.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Record.obj: Record.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
SourceSink.obj: SourceSink.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Squeeze.obj: Squeeze.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Thread.obj: Thread.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Value.obj: Value.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Version.obj: Version.c NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
imgconv.exe: ImgConv.obj $(STATICLIB)
$(LD) $(LDFLAGS) -out:$@ ImgConv.obj $(STATICLIB)
launder.exe: Launder.obj $(STATICLIB)
$(LD) $(LDFLAGS) -out:$@ Launder.obj $(STATICLIB)
test-basic.exe: TestBasic.obj $(STATICLIB)
$(LD) $(LDFLAGS) -out:$@ TestBasic.obj $(STATICLIB)
test-basic-d.exe: TestBasic.obj $(IMPLIB)
$(LD) $(LDFLAGS) -out:$@ TestBasic.obj $(IMPLIB)
test-extract.exe: TestExtract.obj $(STATICLIB)
$(LD) $(LDFLAGS) -out:$@ TestExtract.obj $(STATICLIB)
test-simple.exe: TestSimple.obj $(STATICLIB)
$(LD) $(LDFLAGS) -out:$@ TestSimple.obj $(STATICLIB)
test-twirl.exe: TestTwirl.obj $(STATICLIB)
$(LD) $(LDFLAGS) -out:$@ TestTwirl.obj $(STATICLIB)
# generic rules
{$(TOP)}.c.obj:
$(CC) -c $(WFLAGS) $(CFLAGS) $<
{$(TOP)/samples}.c.obj:
$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) $<
# dependency info
COMMON_HDRS = NufxLibPriv.h NufxLib.h MiscStuff.h SysDefs.h
Archive.obj: Archive.c $(COMMON_HDRS)
ArchiveIO.obj: ArchiveIO.c $(COMMON_HDRS)
Bzip2.obj: Bzip2.c $(COMMON_HDRS)
Compress.obj: Compress.c $(COMMON_HDRS)
Crc16.obj: Crc16.c $(COMMON_HDRS)
Debug.obj: Debug.c $(COMMON_HDRS)
Deferred.obj: Deferred.c $(COMMON_HDRS)
Deflate.obj: Deflate.c $(COMMON_HDRS)
Entry.obj: Entry.c $(COMMON_HDRS)
Expand.obj: Expand.c $(COMMON_HDRS)
FileIO.obj: FileIO.c $(COMMON_HDRS)
Funnel.obj: Funnel.c $(COMMON_HDRS)
Lzc.obj: Lzc.c $(COMMON_HDRS)
Lzw.obj: Lzw.c $(COMMON_HDRS)
MiscStuff.obj: MiscStuff.c $(COMMON_HDRS)
MiscUtils.obj: MiscUtils.c $(COMMON_HDRS)
Record.obj: Record.c $(COMMON_HDRS)
SourceSink.obj: SourceSink.c $(COMMON_HDRS)
Squeeze.obj: Squeeze.c $(COMMON_HDRS)
Thread.obj: Thread.c $(COMMON_HDRS)
Value.obj: Value.c $(COMMON_HDRS)
Version.obj: Version.c $(COMMON_HDRS)
Exerciser.obj: samples/Exerciser.c $(COMMON_HDRS)
ImgConv.obj: samples/ImgConv.c $(COMMON_HDRS)
Launder.obj: samples/Launder.c $(COMMON_HDRS)
TestBasic.obj: samples/TestBasic.c $(COMMON_HDRS)
TestExtract.obj: samples/TestExtract.c $(COMMON_HDRS)
TestSimple.obj: samples/TestSimple.c $(COMMON_HDRS)
TestTwirl.obj: samples/TestTwirl.c $(COMMON_HDRS)

View File

@ -27,7 +27,7 @@
#include <assert.h>
/* basic Win32 stuff -- info-zip has much more complete defs */
#if defined(WIN32) || defined(MSDOS)
#if defined(_WIN32) || defined(MSDOS)
# define WINDOWS_LIKE
# ifndef HAVE_CONFIG_H

View File

@ -1,95 +1,78 @@
# Makefile for NuLib2 using Microsoft Visual C++.
#
# Makefile for Microsoft C compilers. Tested against Visual C++ 6.0.
# Not pretty but it seems to work.
# Tested with VS 2013 Pro.
#
# Run with "nmake /f Makefile.msc". Expects NufxLib to have been built
# in "..\nufxlib-$(VERSION)".
#
# 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, 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.
# If you're including zlib support, place a copy of the zlib
# library in this directory.
#
# Windows magic
TARGETOS = BOTH
!include <ntwin32.mak>
VERSION=220
NUFXSRCDIR = ..\nufxlib-$(VERSION)
# object files
OBJS1 = Add.obj ArcUtils.obj Binary2.obj Delete.obj Extract.obj Filename.obj
OBJS2 = List.obj Main.obj MiscStuff.obj MiscUtils.obj State.obj SysUtils.obj
OBJS = $(OBJS1) $(OBJS2)
!ifdef DLL
### build using the same libc as the DLL
!ifdef NODEBUG
#OPT = $(cdebug) /D NDEBUG /MD
OPT = $(cdebug) /MD
LIB_FLAGS = /nodefaultlib:libcd.lib /nologo setargv.obj
!else
#OPT = $(cdebug) /MDd
OPT = $(cdebug) /D DEBUG_MSGS /MDd
LIB_FLAGS = /nodefaultlib:libc.lib /nologo setargv.obj
!endif
!else
### build against static lib
!ifdef NODEBUG
#OPT = $(cdebug) /D NDEBUG /ML
OPT = $(cdebug) /ML
LIB_FLAGS = /nodefaultlib:libcd.lib /nologo libc.lib setargv.obj
!else
#OPT = $(cdebug) /MLd
OPT = $(cdebug) /D DEBUG_MSGS /MLd
LIB_FLAGS = /nodefaultlib:libc.lib /nologo libcd.lib setargv.obj
!endif
!endif
BUILD_FLAGS = /W3 /GX /D "WIN32" /D "_CONSOLE" /I "$(NUFXSRCDIR)"
!ifdef LIBZ
LIB_FLAGS = zlib.lib $(LIB_FLAGS)
!endif
!ifdef LIBBZ2
LIB_FLAGS = libbz2.lib $(LIB_FLAGS)
!endif
# how to compile sources
.c.obj:
@$(cc) $(OPT) $(BUILD_FLAGS) $(cflags) $(cvars) -o $@ $<
TOP = .
NUFXSRCDIR = ..\nufxlib
PRODUCT = nulib2.exe
CC = cl
LD = link
# C compiler flags
# -Ox: full optimization
# -Oy-: disable frame pointer omission (for easier debugging)
# -MD: create a multithreaded DLL using MSVCRT.lib; alternatively,
# use -MDd to create a debug executable with MSVCRTD.lib
# -nologo: suppress display of copyright banner
# -W3: set warning level to 3 (all production-level warnings)
# -Zi: generate a PDB file with full debugging info
CFLAGS = -nologo -MD -W3 -Ox -Oy- -Zi "-I$(NUFXSRCDIR)"
# Warning suppression flags
WFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
# Linker flags
# -debug: creates debugging info for EXE or DLL in PDB file
# -nologo: suppress display of copyright banner
# -opt:ref: eliminates unreferenced functions and data (default for non-debug
# builds, but we've enabled debug info)
LDFLAGS = -nologo -debug -opt:ref
ZLIB=1
!ifdef ZLIB
# enable deflate support; requires zlib
LDFLAGS = $(LDFLAGS) zlib.lib
!endif
# object files
OBJS = Add.obj ArcUtils.obj Binary2.obj Delete.obj Extract.obj Filename.obj \
List.obj Main.obj MiscStuff.obj MiscUtils.obj State.obj SysUtils.obj
# build targets
all: $(PRODUCT)
nulib2.exe: $(OBJS) $(NUFXSRCDIR)\nufxlib2.lib
$(link) $(ldebug) $** -out:$@ $(NUFXSRCDIR)\nufxlib2.lib $(LIB_FLAGS)
$(PRODUCT): $(OBJS) $(NUFXSRCDIR)\nufxlib2.lib
$(LD) $(LDFLAGS) -out:$@ $(OBJS) $(NUFXSRCDIR)\nufxlib2.lib
clean:
del *.obj
del $(PRODUCT)
-del *.obj *.pdb *.exp
-del $(PRODUCT)
Add.obj: Add.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
ArcUtils.obj: ArcUtils.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
Binary2.obj: Binary2.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
Delete.obj: Delete.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
Extract.obj: Extract.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
Filename.obj: Filename.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
List.obj: List.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
Main.obj: Main.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
MiscStuff.obj: MiscStuff.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
MiscUtils.obj: MiscUtils.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
State.obj: State.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
SysUtils.obj: SysUtils.c NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
# generic rules
.c.obj:
$(CC) -c $(WFLAGS) $(CFLAGS) $<
# dependency info
COMMON_HDRS = NuLib2.h $(NUFXSRCDIR)\NufxLib.h SysDefs.h State.h MiscStuff.h
Add.obj: Add.c $(COMMON_HDRS)
ArcUtils.obj: ArcUtils.c $(COMMON_HDRS)
Binary2.obj: Binary2.c $(COMMON_HDRS)
Delete.obj: Delete.c $(COMMON_HDRS)
Extract.obj: Extract.c $(COMMON_HDRS)
Filename.obj: Filename.c $(COMMON_HDRS)
List.obj: List.c $(COMMON_HDRS)
Main.obj: Main.c $(COMMON_HDRS)
MiscStuff.obj: MiscStuff.c $(COMMON_HDRS)
MiscUtils.obj: MiscUtils.c $(COMMON_HDRS)
State.obj: State.c $(COMMON_HDRS)
SysUtils.obj: SysUtils.c $(COMMON_HDRS)

View File

@ -27,7 +27,7 @@
#include <assert.h>
/* basic Win32 stuff -- info-zip has much more complete defs */
#if defined(WIN32) || defined(MSDOS)
#if defined(_WIN32) || defined(MSDOS)
# define WINDOWS_LIKE
# ifndef HAVE_CONFIG_H