New file, hand-written wrapper for the Wintab library.
2001-10-29 Tor Lillqvist <tml@iki.fi> * gdk/win32/libwntab32x.la: New file, hand-written wrapper for the Wintab library. * gdk/win32/gdkwin32.h * gdk/win32/gdkprivate-win32.h: Reorganise to match corresponding X11 headers better, and to enable gdkwin32.h to be installed and included from applications, but not the *-win32.h headers. * gdk/win32/*.c: Corresponding small changes, simplifications of #includes. * gdk/win32/gdkregion-win32.c: Remove. * gdk/win32/gdkevents-win32.c (print_event): Add GDK_SETTING. * gdk/win32/gdkfont-win32.c * gdk/win32/gdkgeometry-win32.c: Remove unused variables. * gdk/win32/gdkproperty-win32.c (gdk_atom_intern): Don't insert GDK_NONE values into hash table. Changes for autoconfiscated build on Win32, and addition of Win32 backend to the related files: * gdk/win32/Makefile.am: Actually enable building the win32 objects here, not just list all files in EXTRA_DIST. Link in the compiled resource file from rc/gdk-win32res.lo. If HAVE_WINTAB, copy the Wintab library into the .libs directory. * gdk/win32/gdkwindow-win32.c (RegisterGdkClass): Don't assume the name of the GDK DLL when fetching the icon. Use the HMODULE saved in gdk_dll_hinstance by DllMain. * gdk/win32/rc/Makefile.am: Build gdk-win32res.lo using the build/win32/lt-compile-resource script. * gdk/win32/rc/gdk.rc.in * gtk/gtk-win32.rc.in: Use the DLL name that libtool would use.
This commit is contained in:
committed by
Tor Lillqvist
parent
47dc8d4dac
commit
a53f14a6e3
@ -1,8 +1,39 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
libgdkincludedir = $(includedir)/gtk-2.0/gdk
|
||||
|
||||
INCLUDES = @STRIP_BEGIN@ \
|
||||
-DG_LOG_DOMAIN=\"Gdk\" \
|
||||
-DINSIDE_GDK_WIN32 \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/gdk \
|
||||
-I$(top_builddir)/gdk \
|
||||
@GTK_DEBUG_FLAGS@ \
|
||||
@GDK_DEP_CFLAGS@ \
|
||||
@GDK_WIN32_EXTRA_CFLAGS@\
|
||||
-DGDK_COMPILATION \
|
||||
@STRIP_END@
|
||||
|
||||
LDADDS = @STRIP_BEGIN@ \
|
||||
@GDK_DEP_LIBS@ \
|
||||
@STRIP_END@
|
||||
|
||||
if HAVE_WINTAB
|
||||
noinst_DATA = .libs/libwntab32x.a
|
||||
|
||||
.libs/libwntab32x.a: @WINTAB_LIB@
|
||||
cp $< $@
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES = libgdk-win32.la
|
||||
|
||||
SUBDIRS=rc
|
||||
|
||||
EXTRA_DIST = \
|
||||
makefile.mingw \
|
||||
makefile.msc \
|
||||
makefile.msc
|
||||
|
||||
libgdk_win32_la_SOURCES = \
|
||||
bdfcursor.c \
|
||||
xcursors.h \
|
||||
gdkcolor-win32.c \
|
||||
@ -27,7 +58,6 @@ EXTRA_DIST = \
|
||||
gdkpixmap-win32.h \
|
||||
gdkprivate-win32.h \
|
||||
gdkproperty-win32.c \
|
||||
gdkregion-win32.c \
|
||||
gdkselection-win32.c \
|
||||
gdkvisual-win32.c \
|
||||
gdkwin32.h \
|
||||
@ -35,3 +65,8 @@ EXTRA_DIST = \
|
||||
gdkwindow-win32.c \
|
||||
gdkwindow-win32.h \
|
||||
surrogate-dimm.h
|
||||
|
||||
libgdkinclude_HEADERS = \
|
||||
gdkwin32.h
|
||||
|
||||
libgdk_win32_la_LIBADD = rc/gdk-win32res.lo
|
||||
|
||||
Reference in New Issue
Block a user