X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=9f9f1a208b6b6a6047b4f871799cba6a5bb86d39;hb=69037d6ddbe7e90d13d8a7a088d8c209a926190e;hp=aef9a77ad7ebd3ce3734145293816c8f899306db;hpb=72a310c8265a0d1e3e95fabb2987f70cfecbf525;p=xournal.git diff --git a/src/Makefile.am b/src/Makefile.am index aef9a77..9f9f1a2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,10 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = ttsubset +if WIN32 + SUBDIRS = ttsubset win32 +else + SUBDIRS = ttsubset +endif INCLUDES = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ @@ -14,11 +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-shapes.c xo-shapes.h -xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) +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