mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-10 10:50:10 +00:00
aeaaae04ac
Wed Jun 5 18:34:47 2002 Owen Taylor <otaylor@redhat.com> Changes multihead reorganizing code for win32 support, mostly from a patch by Hans Breuer. * gdk/gdkcolor.c gdk/x11/gdkcolor-x11.c gdk/gdkcursor.c gdk/x11/gdkcursor-x11.c gdk/gdkevents.c gdk/x11/gdkevents-x11.c gdk/gdkfont.c gdk/x11/gdkfont-x11.c gdk/gdkkeys.c gdk/x11/gdkkeys-x11.c gdk/gdkimage.c gdk/x11/gdkimage-x11.c gdk/gdkscreen.c gdk/x11/gdkmain-x11.c gdk/gdkdisplay.c gdk/gdkevents-x11.c gdk/gdkpango.c gdk/x11/gdkpango-x11.c gdk/gdkselection.c gdk/x11/gdkselection-x11.c gdk/gdkwindow.c gdk/x11/gdkwindow-x11.c gdk/gdkvisual.c gdk/x11/gdkvisual-x11.c: Move port-independent singlehead wrapper functions into port-independent part of GDK. (#80009) * gdk/win32/gdkcolor-win32.c gdk/win32/gdkcursor-win32.c gdk/win32/gdkevents-win32.c gdk/win32/gdkfont-win32.c gdk/win32/gdkimage-win32.c gdk/win32/gdkkeys-win32.c gdk/win32/gdkmain-win32.c gdk/win32/gdkproperty-win32.c gdk/win32/gdkselection-win32.c gdk/win32/gkwindow-win32.c: Turn singlehead functions into "multihead" functions that ignore their GdkDisplay or GdkScreen arguments. * gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c gdk/win32/gdkinput-win32.c gdk/win32/gdkprivate-win32.h: Misc multihead-compatibility changes. * gtk/gtk.def gdk/gdk.def: Update for multihead functions. * gdk/gdkcolormap.h gdk/gdkvisual.h gdk/x11/gdkcolormap-x11.c gdk/x11/gdkvisual-x11.c: Remove the screen fields from the public parts of the colormap/visual structures, add accessors instead. * gdk/gdkpixbuf-render.c gdk/gdkpixmap.c gdk/gdkrgb.c gdk/x11/gdkcolormap-x11.c gdk/x11/gdkimage-x11.c gdk/x11/gdkimage-x11.c gdk/x11/gdkprivate-x11.h gtk/gtkgc.c gtk/gtkstyle.c gtk/gtkwidget.c: Use accessors to get the screen for colormaps, visuals; move the fields into the private structures for the x11 backend. * gdk/gdkdisplay.[ch] gdk/x11/gdkdisplay-x11.[ch] gdk/gdkscreen.[ch] gdk/x11/gdkscreen-x11.c: Remove virtualization of screen and display functions. (#79990, patch from Erwann Chenede) * gdk/win32/gdkdisplay-x11.c gdk/win32/gdkscreen-win32.c gdk/win32/{Makefile.am, makefile.msc, makefile.mingw}: New files containing stub implementations of Display, Screen functions. * gdk/x11/gdkscreen-x11.[ch] gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkx.h: Clean up function exports and what headers they are in. (#79954) * gdk/x11/gdkx.h: Fix macro that was referring to a non-existant screen->screen_num. (In the patch for #79972, Erwann Chenede) * gdk/gdkscreen.c gdk/gdkwindow.c gdk/x11/gdkinternals.h gdk/x11/gdkscreen-x11.c: Fix gdk_screen_get_window_at_pointer() to use window hooks. (#79972, patch partly from Erwann Chenede) * gdk/x11/gdkdisplay-x11.c gdk/x11/gdkevents-x11.c: Fix some warnings.
150 lines
3.5 KiB
Plaintext
150 lines
3.5 KiB
Plaintext
## Makefile for building the GDK DLL with Microsoft C
|
|
## Use: nmake -f makefile.msc
|
|
|
|
## You must first build the Win32-dependent sources in the win32 subdirectory.
|
|
|
|
## There is no install target, you have to decide where and
|
|
## how to install for yourself.
|
|
|
|
TOP = ../..
|
|
!INCLUDE $(TOP)/glib/build/win32/make.msc
|
|
|
|
# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
|
|
# definition should possibly go to build/win32/module.def, too.
|
|
WTKIT = ..\..\wtkit126
|
|
|
|
###############################################################
|
|
|
|
# Nothing much configurable below
|
|
|
|
!IFNDEF DEBUG
|
|
# Full optimization:
|
|
OPTIMIZE = -Ox -MD -Zi
|
|
LINKDEBUG = /nodefaultlib:libc.lib
|
|
!ELSE
|
|
# Debugging:
|
|
OPTIMIZE = -Zi -MDd
|
|
LINKDEBUG = /nodefaultlib:libcd.lib /nodefaultlib:libc.lib /debug
|
|
!ENDIF
|
|
|
|
# cl -? describes the options
|
|
CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
|
|
|
|
LDFLAGS = /link $(LINKDEBUG)
|
|
|
|
# overwrite version?
|
|
GTK_VER=2.0
|
|
GDK_PIXBUF_VER=$(GTK_VER)
|
|
|
|
!IFNDEF PERL
|
|
PERL = perl
|
|
!ENDIF
|
|
|
|
CFLAGS = -FImsvc_recommended_pragmas.h -I . -I .. \
|
|
$(GLIB_CFLAGS) $(PANGO_CFLAGS) -I ../gdk-pixbuf \
|
|
$(G_DEBUGGING) -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN -DGDK_VERSION=\"$(GTK_VER)\"
|
|
EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \
|
|
..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib $(PANGOWIN32_LIBS)
|
|
|
|
gdk-win32-backend :
|
|
cd win32
|
|
nmake -nologo -f makefile.msc
|
|
cd ..
|
|
|
|
all: \
|
|
..\config.h \
|
|
gdkconfig.h \
|
|
gdkenumtypes.h \
|
|
gdkenumtypes.c \
|
|
gdk-win32-backend \
|
|
gdk-win32-$(GTK_VER).dll \
|
|
testgdk.exe \
|
|
gdk-win32-$(GTK_VER)s.lib \
|
|
# gdk-x11-$(GTK_VER).dll \
|
|
|
|
gdk_OBJECTS = \
|
|
gdk.obj \
|
|
gdkcolor.obj \
|
|
gdkcursor.obj \
|
|
gdkdraw.obj \
|
|
gdkenumtypes.obj \
|
|
gdkevents.obj \
|
|
gdkfont.obj \
|
|
gdkgc.obj \
|
|
gdkglobals.obj \
|
|
gdkimage.obj \
|
|
gdkkeys.obj \
|
|
gdkkeyuni.obj \
|
|
gdkpango.obj \
|
|
gdkpixbuf-drawable.obj \
|
|
gdkpixbuf-render.obj \
|
|
gdkpixmap.obj \
|
|
gdkpolyreg-generic.obj \
|
|
gdkrectangle.obj \
|
|
gdkregion-generic.obj \
|
|
gdkrgb.obj \
|
|
gdkselection.obj \
|
|
gdkvisual.obj \
|
|
gdkwindow.obj
|
|
|
|
gdk_public_h_sources = \
|
|
gdk.h \
|
|
gdkcolor.h \
|
|
gdkcursor.h \
|
|
gdkdnd.h \
|
|
gdkdrawable.h \
|
|
gdkevents.h \
|
|
gdkfont.h \
|
|
gdkgc.h \
|
|
gdkkeysyms.h \
|
|
gdki18n.h \
|
|
gdkimage.h \
|
|
gdkinput.h \
|
|
gdkkeys.h \
|
|
gdkpango.h \
|
|
gdkpixbuf.h \
|
|
gdkpixmap.h \
|
|
gdkproperty.h \
|
|
gdkregion.h \
|
|
gdkrgb.h \
|
|
gdkselection.h \
|
|
gdktypes.h \
|
|
gdkvisual.h \
|
|
gdkwindow.h \
|
|
|
|
gdkenumtypes.h: $(gdk_public_h_sources) makeenums.pl
|
|
$(PERL) makeenums.pl include $(gdk_public_h_sources) > gdkenumtypes.h
|
|
|
|
gdkenumtypes.c: $(gdk_public_h_sources) makeenums.pl
|
|
$(PERL) makeenums.pl cfile $(gdk_public_h_sources) > gdkenumtypes.c
|
|
|
|
..\config.h : ..\config.h.win32
|
|
copy ..\config.h.win32 ..\config.h
|
|
|
|
gdkconfig.h : gdkconfig.h.win32
|
|
copy gdkconfig.h.win32 gdkconfig.h
|
|
|
|
gdk-win32-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
|
|
$(CC) $(CFLAGS) -LD -Fegdk-win32-$(GTK_VER).dll $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res $(LDFLAGS) /def:gdk.def
|
|
|
|
gdk-win32-$(GTK_VER)s.lib : $(gdk_OBJECTS)
|
|
lib /out:gdk-win32-$(GTK_VER)s.lib $(gdk_OBJECTS) win32\gdk-win32.lib
|
|
|
|
gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def x11\gdk-x11.lib
|
|
$(CC) $(CFLAGS) -LD -Fegdk-x11-$(GTK_VER).dll $(gdk_OBJECTS) \
|
|
$(PANGO)\pango\pangox-$(PANGO_VER).lib \
|
|
x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS) /def:gdk.def
|
|
|
|
testgdk.exe : gdk-win32-$(GTK_VER).dll testgdk.obj
|
|
$(CC) -Fetestgdk.exe testgdk.obj gdk-win32-$(GTK_VER).lib $(EXTRALIBS) $(LDFLAGS)
|
|
|
|
.c.obj :
|
|
$(CC) $(CFLAGS) -GD -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
|
|
|
|
clean::
|
|
del *.dll
|
|
del *.obj
|
|
del *.lib
|
|
del *.err
|
|
del *.res
|