diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2009-05-20 21:32:54 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2009-06-29 18:00:03 +0100 |
| commit | 65d74d93145d22b68bad5728a7ebe38dc662cb21 (patch) | |
| tree | 0f456370142367b6639e202535f0066a43084de2 /hw/xwin/Makefile.am | |
| parent | 638ca9a7a2363757dc5b5d456e10d34f6f158885 (diff) | |
Cygwin/X: Fix multiwindow extwm mode to build again
Build and link with rootless extension
Update Xwin code for removal of RootlessAccelInit()
Fix Xwin code which now has a collision with the type name EventType
Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'hw/xwin/Makefile.am')
| -rw-r--r-- | hw/xwin/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index aab4b08da..2c7972a7f 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -34,6 +34,7 @@ SRCS_MULTIWINDOWEXTWM = \ winwin32rootlesswndproc.c \ winwindowswm.c DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM +MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la endif if XWIN_NATIVEGDI @@ -147,7 +148,7 @@ XWin_SOURCES = $(SRCS) INCLUDES = -I$(top_srcdir)/miext/rootless XWin_DEPENDENCIES = $(XWIN_LIBS) -XWin_LDADD = $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS) +XWin_LDADD = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS) .rc.o: $(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\" |