X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=9f9f1a208b6b6a6047b4f871799cba6a5bb86d39;hb=69037d6ddbe7e90d13d8a7a088d8c209a926190e;hp=f61c052ee0967c68c142cc9cde3910a3ce3828b6;hpb=6882d6c15461712e95f3046c078e66737f23941c;p=xournal.git

diff --git a/src/Makefile.am b/src/Makefile.am
index f61c052..9f9f1a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
+if WIN32
+  SUBDIRS = ttsubset win32
+else
+  SUBDIRS = ttsubset
+endif
+
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@@ -12,10 +18,19 @@ xournal_SOURCES = \
 	xo-misc.c xo-misc.h \
 	xo-file.c xo-file.h \
 	xo-paint.c xo-paint.h \
+	xo-selection.c xo-selection.h \
+	xo-clipboard.c xo-clipboard.h \
+	xo-image.c xo-image.h \
 	xo-print.c xo-print.h \
 	xo-support.c xo-support.h \
 	xo-interface.c xo-interface.h \
-	xo-callbacks.c xo-callbacks.h 
+	xo-callbacks.c xo-callbacks.h \
+	xo-shapes.c xo-shapes.h
 
-xournal_LDADD = @PACKAGE_LIBS@
+if WIN32
+  xournal_LDFLAGS = -mwindows
+  xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
+else
+  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm
+endif