X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=7700f46ac78bdb703939dbe6f84488882fbf5282;hp=d9bff7161dd7503fe84d01532faa2b9ff2419828;hb=8f520d21297a3ae557d82b586ad369662714d829;hpb=91bf828018cb7740ef73ba87b6da0926d5e69fef

diff --git a/Makefile.am b/Makefile.am
index d9bff716..7700f46a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS	= -I$(top_srcdir)/src
+AM_CPPFLAGS	= -I$(top_srcdir)/src $(WINDOWS_CPPFLAGS)
 
 AM_CFLAGS	= -std=gnu99 -D_LARGEFILE_SOURCE \
 		   -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 3:0:1
+libwim_la_LDFLAGS = -version-info 4:0:2 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
@@ -82,11 +82,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 +98,11 @@ bin_PROGRAMS	 = imagex
 imagex_SOURCES   = programs/imagex.c
 imagex_LDADD	 = $(top_builddir)/libwim.la
 
+if WINDOWS_NATIVE_BUILD
+imagex_SOURCES += programs/imagex-win32.c programs/imagex-win32.h
+libwim_la_SOURCES += src/win32.c
+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,10 @@ if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 
+if WINDOWS_NATIVE_BUILD
+# TODO: The tests need to be re-written for Windows builds.
+TESTS =
+else
 TESTS = $(dist_check_SCRIPTS)
+endif