diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-05-14 04:39:29 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-05-14 04:39:29 +0000 |
| commit | 5ef6c479db46ef22290bf8ae46d122d67bae8747 (patch) | |
| tree | cbf8340bd4e2bbd7e3edce2d1c7463ed46c7d021 /win | |
| parent | fee65d5e7ddf80b0d02fdc2d0996cec7fc7e27e3 (diff) | |
| download | tigervnc-5ef6c479db46ef22290bf8ae46d122d67bae8747.tar.gz tigervnc-5ef6c479db46ef22290bf8ae46d122d67bae8747.zip | |
Fix VPATH and out-of-tree builds when using MinGW
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4054 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win')
| -rw-r--r-- | win/vncconfig/Makefile.am | 10 | ||||
| -rw-r--r-- | win/vncviewer/Makefile.am | 10 | ||||
| -rw-r--r-- | win/winvnc/Makefile.am | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/win/vncconfig/Makefile.am b/win/vncconfig/Makefile.am index 82cb7daa..84d1b0ff 100644 --- a/win/vncconfig/Makefile.am +++ b/win/vncconfig/Makefile.am @@ -7,11 +7,11 @@ vncconfig_SOURCES = $(HDRS) Legacy.cxx PasswordDialog.cxx vncconfig.cxx vncconfig_CPPFLAGS = -I$(top_srcdir)/win -I$(top_srcdir)/common
-vncconfig_LDADD = $(top_srcdir)/win/rfb_win32/librfb_win32.la \
- $(top_srcdir)/common/rfb/librfb.la \
- $(top_srcdir)/common/Xregion/libXregion.la \
- $(top_srcdir)/common/network/libnetwork.la \
- $(top_srcdir)/common/rdr/librdr.la -lws2_32 -lgdi32 -lversion -lole32 \
+vncconfig_LDADD = $(top_builddir)/win/rfb_win32/librfb_win32.la \
+ $(top_builddir)/common/rfb/librfb.la \
+ $(top_builddir)/common/Xregion/libXregion.la \
+ $(top_builddir)/common/network/libnetwork.la \
+ $(top_builddir)/common/rdr/librdr.la -lws2_32 -lgdi32 -lversion -lole32 \
-lcomctl32 resources.o
EXTRA_DIST = vncconfig.ico vncconfig.rc vncconfig.exe.manifest
diff --git a/win/vncviewer/Makefile.am b/win/vncviewer/Makefile.am index d58df378..db398aef 100644 --- a/win/vncviewer/Makefile.am +++ b/win/vncviewer/Makefile.am @@ -32,11 +32,11 @@ vncviewer_SOURCES = $(HDRS) \ vncviewer_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win -vncviewer_LDADD = $(top_srcdir)/common/rfb/librfb.la \ - $(top_srcdir)/win/rfb_win32/librfb_win32.la \ - $(top_srcdir)/common/Xregion/libXregion.la \ - $(top_srcdir)/common/network/libnetwork.la \ - $(top_srcdir)/common/rdr/librdr.la \ +vncviewer_LDADD = $(top_builddir)/common/rfb/librfb.la \ + $(top_builddir)/win/rfb_win32/librfb_win32.la \ + $(top_builddir)/common/Xregion/libXregion.la \ + $(top_builddir)/common/network/libnetwork.la \ + $(top_builddir)/common/rdr/librdr.la \ resources.o -lws2_32 -lgdi32 -luser32 -lcomctl32 -lversion -lcomdlg32 vncviewer_LDFLAGS = -I$(top_srcdir)/win -mwindows diff --git a/win/winvnc/Makefile.am b/win/winvnc/Makefile.am index da555fe3..19f3ada2 100644 --- a/win/winvnc/Makefile.am +++ b/win/winvnc/Makefile.am @@ -10,11 +10,11 @@ winvnc4_SOURCES = $(HDRS) buildTime.cxx ControlPanel.cxx JavaViewer.cxx \ winvnc4_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win
-winvnc4_LDADD = $(top_srcdir)/common/rfb/librfb.la \
- $(top_srcdir)/win/rfb_win32/librfb_win32.la \
- $(top_srcdir)/common/Xregion/libXregion.la \
- $(top_srcdir)/common/network/libnetwork.la \
- $(top_srcdir)/common/rdr/librdr.la resources.o -lws2_32 -lgdi32 \
+winvnc4_LDADD = $(top_builddir)/common/rfb/librfb.la \
+ $(top_builddir)/win/rfb_win32/librfb_win32.la \
+ $(top_builddir)/common/Xregion/libXregion.la \
+ $(top_builddir)/common/network/libnetwork.la \
+ $(top_builddir)/common/rdr/librdr.la resources.o -lws2_32 -lgdi32 \
-lole32 -lcomctl32 -lversion
winvnc4_LDFLAGS = -mwindows
|