Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
# 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.
|
|
|
|
|
#
|
|
|
|
|
# Tested with VS 2013 Pro. From the "VS2013 x86 Native Tools Command
|
|
|
|
|
# Prompt", run "nmake -f makefile.msc".
|
|
|
|
|
#
|
|
|
|
|
# If you're including zlib support, place copies of zlib.h, zconf.h,
|
|
|
|
|
# and the zlib library in this directory.
|
|
|
|
|
#
|
|
|
|
|
# Adapted from zlib's Makefile.msc.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
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"
|
|
|
|
|
|
|
|
|
|
LIB_CFLAGS = -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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# object files
|
2015-01-04 19:29:51 +00:00
|
|
|
OBJS = Archive.obj ArchiveIO.obj Bzip2.obj Charset.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
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
# build targets -- static library, dynamic library, and test programs
|
|
|
|
|
all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \
|
2015-01-04 19:29:51 +00:00
|
|
|
exerciser.exe imgconv.exe launder.exe test-basic.exe test-basic-d.exe \
|
|
|
|
|
test-extract.exe test-names.exe test-simple.exe test-twirl.exe
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
|
|
|
|
|
clean:
|
|
|
|
|
-del *.obj *.pdb *.exp
|
|
|
|
|
-del $(STATICLIB) $(SHAREDLIB) $(IMPLIB)
|
|
|
|
|
|
|
|
|
|
$(STATICLIB): $(OBJS)
|
|
|
|
|
$(AR) $(ARFLAGS) -out:$@ $(OBJS)
|
|
|
|
|
|
|
|
|
|
$(IMPLIB): $(SHAREDLIB)
|
|
|
|
|
|
|
|
|
|
$(SHAREDLIB): $(OBJS)
|
|
|
|
|
$(LD) $(LDFLAGS) -dll -def:nufxlib.def -implib:$(IMPLIB) -out:$@ \
|
|
|
|
|
$(OBJS)
|
|
|
|
|
|
|
|
|
|
exerciser.exe: Exerciser.obj $(STATICLIB)
|
|
|
|
|
$(LD) $(LDFLAGS) -out:$@ Exerciser.obj $(STATICLIB)
|
|
|
|
|
|
|
|
|
|
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)
|
|
|
|
|
|
2015-01-04 19:29:51 +00:00
|
|
|
test-names.exe: TestNames.obj $(STATICLIB)
|
|
|
|
|
$(LD) $(LDFLAGS) -out:$@ TestNames.obj $(STATICLIB)
|
|
|
|
|
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
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) $(LIB_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)
|
2015-01-04 19:29:51 +00:00
|
|
|
Charset.obj: Charset.c $(COMMON_HDRS)
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
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)
|
2015-01-04 19:29:51 +00:00
|
|
|
TestNames.obj: samples/TestNames.c $(COMMON_HDRS)
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
TestSimple.obj: samples/TestSimple.c $(COMMON_HDRS)
|
|
|
|
|
TestTwirl.obj: samples/TestTwirl.c $(COMMON_HDRS)
|
|
|
|
|
|