Windows native build

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ca3c1d3bf0e1552e4adb54fdee6a594130b66935..5dc694b7ccd49cc9bb3714e329291e63aa1e1d09 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ AM_CFLAGS       = -std=gnu99 -D_LARGEFILE_SOURCE \
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 4:0:2 $(CYGWIN_EXTRA_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 4:0:2 $(WINDOWS_EXTRA_LDFLAGS)
 
 libwim_la_SOURCES =            \
        src/add_image.c         \
@@ -83,7 +83,8 @@ libwim_la_LIBADD =            \
        $(LTLIBICONV)           \
        $(LIBCRYPTO_LDADD)      \
        $(SSSE3_SHA1_OBJ)       \
-       $(PTHREAD_LDADD)
+       $(PTHREAD_LDADD)        \
+       $(WINDOWS_LDADD)
 
 libwim_la_CFLAGS =             \
        $(AM_CFLAGS)            \
@@ -98,6 +99,10 @@ bin_PROGRAMS  = imagex
 imagex_SOURCES   = programs/imagex.c
 imagex_LDADD    = $(top_builddir)/libwim.la
 
+if WINDOWS_BUILD
+imagex_SOURCES += programs/imagex-win32.c programs/imagex-win32.h
+endif
+
 dist_bin_SCRIPTS = programs/mkwinpeimg
 
 include_HEADERS = src/wimlib.h
@@ -155,5 +160,13 @@ if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 
+if WINDOWS_BUILD
+TESTS =
+else
+# TODO: The tests need to be re-written for Windows builds.  One issue (that
+# applies to both test-imagex and test-imagex-capture_and_apply) is that
+# Cygwin's 'ln -s' will create some sort of regular file with special contents
+# rather than a reparse point.
 TESTS = $(dist_check_SCRIPTS)
+endif