Modify makefiles and common.h to support Windows build

diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am
index bbbaeb9544d1f7a029b7957c891c2a7703137b12..6935c4dbbcdea264d5c62023f97d181b121cb585 100644 (file)
--- a/cmd/lefty/Makefile.am
+++ b/cmd/lefty/Makefile.am
@@ -45,6 +45,11 @@ man_MANS = $(man)
 pdf_DATA = $(pdf)
 endif
 endif
+if WITH_WIN32
+bin_PROGRAMS = lefty
+man_MANS = $(man)
+pdf_DATA = $(pdf)
+endif
 
 lefty_DATA = lefty.psp
 
@@ -55,12 +60,19 @@ lefty_SOURCES = code.c common.c display.c exec.c g.c gfxview.c internal.c \
 # NB. -lXaw must be before -lXt or strange inability-to-get-mouse-focus
 # problems can occur on some systems.
 #
+if WITH_WIN32
+lefty_LDADD = $(top_builddir)/cmd/lefty/dot2l/libdot2l.la \
+       $(top_builddir)/cmd/lefty/ws/mswin32/libws.la \
+       $(top_builddir)/cmd/lefty/os/mswin32/libos.la \
+       -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 @MATH_LIBS@
+else
 lefty_LDADD = $(top_builddir)/cmd/lefty/dot2l/libdot2l.la \
        $(top_builddir)/cmd/lefty/ws/x11/libws.la \
        $(top_builddir)/cmd/lefty/ws/x11/libfilereq/libfilereq.la \
        $(top_builddir)/cmd/lefty/os/unix/libos.la \
        @X_LIBS@ @XAW_LIBS@ @X_PRE_LIBS@ @XPM_LIBS@ \
        -lXt -lXmu -lXext -lX11 @SOCKET_LIBS@ @MATH_LIBS@
+endif
 
 .1.pdf:
        -groff -Tps -man $< | ps2pdf - - >$@

diff --git a/cmd/lefty/common.h b/cmd/lefty/common.h
index 4e91299922238f24230afea898de3759a772b5cf..5cc3d22232159fb22a4c617a6109423d9b2a78a7 100644 (file)
--- a/cmd/lefty/common.h
+++ b/cmd/lefty/common.h
@@ -32,7 +32,14 @@ extern "C" {
  */
 #define FEATURE_MINTSIZE 1 
 #define FEATURE_DOT 1
-#ifndef MSWIN32
+#ifdef MSWIN32
+#ifndef FEATURE_WIN32
+#define FEATURE_WIN32 1
+#endif
+#ifndef FEATURE_MS
+#define FEATURE_MS 1
+#endif
+#else
 #define FEATURE_X11 1
 #endif
 #endif