X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=5dc694b7ccd49cc9bb3714e329291e63aa1e1d09;hp=d4a3af6a84a320f7ac0528cd9fdf3fb66eecdb79;hb=2a33c303e30fd740f740e21632fd06b9e414b0c7;hpb=c6e063fcb2b1ffa76df62ab902a38bf5f604d2e2

diff --git a/Makefile.am b/Makefile.am
index d4a3af6a..5dc694b7 100644
--- 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 1:0:0
+libwim_la_LDFLAGS = -version-info 4:0:2 $(WINDOWS_EXTRA_LDFLAGS)
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
@@ -19,6 +19,7 @@ libwim_la_SOURCES =		\
 	src/delete_image.c	\
 	src/dentry.c		\
 	src/dentry.h		\
+	src/encoding.c		\
 	src/endianness.h	\
 	src/export_image.c	\
 	src/extract_image.c	\
@@ -39,7 +40,6 @@ libwim_la_SOURCES =		\
 	src/resource.c		\
 	src/rbtree.c		\
 	src/rbtree.h		\
-	src/rbtree_augmented.h	\
 	src/security.c		\
 	src/security.h		\
 	src/sha1.c		\
@@ -53,6 +53,7 @@ libwim_la_SOURCES =		\
 	src/wim.c		\
 	src/wimlib.h		\
 	src/wimlib_internal.h	\
+	src/win32.c		\
 	src/write.c		\
 	src/xml.c		\
 	src/xml.h		\
@@ -82,11 +83,12 @@ libwim_la_LIBADD =		\
 	$(LTLIBICONV)		\
 	$(LIBCRYPTO_LDADD)	\
 	$(SSSE3_SHA1_OBJ)	\
-	$(PTHREAD_LDADD)
+	$(PTHREAD_LDADD)	\
+	$(WINDOWS_LDADD)
 
 libwim_la_CFLAGS =		\
 	$(AM_CFLAGS)		\
-	-fvisibility=hidden	\
+	$(VISIBILITY_CFLAGS)	\
 	$(LIBXML2_CFLAGS)	\
 	$(LIBFUSE_CFLAGS)	\
 	$(LIBNTFS_3G_CFLAGS)	\
@@ -97,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
@@ -106,6 +112,7 @@ EXTRA_DIST =					\
 	archlinux				\
 	debian					\
 	rpm					\
+	README.WINDOWS				\
 	programs/install.cmd			\
 	programs/wimapply.c			\
 	tests/common_tests.sh			\
@@ -153,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