diff options
| author | Tor Lillqvist <tml@src.gnome.org> | 1999-04-25 21:55:05 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 1999-04-25 21:55:05 +0000 |
| commit | 1c84483f3ee8559179b49a200d3cc6854e81b873 (patch) | |
| tree | 5cf6ca83caba4ca5939841987f95262cac4b5fa7 /gdk/win32/makefile.msc | |
| parent | eedec945df8925c97e924692b08487a292c01580 (diff) | |
| download | gtk+-1c84483f3ee8559179b49a200d3cc6854e81b873.tar.gz | |
Support added for building using a GNU toolchain on Win32,
gcc -mno-cygwin (egcs-1.1.2) on cygwin-b20.1.
* gdk/win32/makefile.cygwin gtk/makefile.cygwin: New files.
* config.h.win32: Changes for gcc.
* gdk/gdkrectangle.c: Include gdk.h as <gdk/gdk.h>.
* gdk/gdkcolor.c: config.h.win32 already defines strcasecmp.
* gdk/win32/gdkconfig.h: Only the MS compiler has wctype.h.
* gdk/win32/gdkdnd.c: Protect (unused) OLE2 stuff better.
Protect shl stuff unavaiilable with mingw32 headers.
* gdk/win32/gdkevents.c: Fix typo.
* gdk/win32/gdkglobals.c: Use GDKVAR here also for gcc.
* gdk/win32/gdkim.c: Use OEM code page for multibyte chars. (?)
* gdk/win32/gdkinput.c: Use __try __except only with the MS compiler.
* gdk/win32/gdkprivate.h: Make up for some stuff missing from
the mingw32 headers.
* gdk/win32/makefile.msc: Use latest Wintab kit and glib.
* gtk/gtkfilesel.c: Include <glib.h> early, to get stat->_stat
definition on Win32. Test for NATIVE_WIN32, not _MSC_VER.
* gtk/gtkfontsel.c: Protect CHARSET redefinition on Win32.
Test for NATIVE_WIN32, not _MSC_VER.
* gtk/gtkmain.c: No use warning about developer version on Win32,
there aren't any non-developer versions anyhow.
* gtk/gtkrc.c: Test for NATIVE_WIN32, not _MSC_VER.
* gtk/makefile.msc: Use pthread from another directory. Minor other
changes.
Diffstat (limited to 'gdk/win32/makefile.msc')
| -rw-r--r-- | gdk/win32/makefile.msc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc index 0594778ec2..0807671593 100644 --- a/gdk/win32/makefile.msc +++ b/gdk/win32/makefile.msc @@ -6,7 +6,7 @@ BIN = C:\bin # Location of the Wintab toolkit. Downloadable from http://www.pointing.com. -WTKIT = ..\..\..\wtkit125 +WTKIT = ..\..\..\wtkit126 # Full optimization: OPTIMIZE = -Ox @@ -17,18 +17,18 @@ OPTIMIZE = -Ox # Nothing much configurable below -# cl -? described the options +# cl -? describes the options CC = cl -G5 -GF $(OPTIMIZE) -W3 -MD -nologo LDFLAGS = /link /machine:ix86 # /debug /debugtype:cv INSTALL = copy TOUCH = copy makefile.msc+nul -GLIB_VER=1.2 +GLIB_VER=1.3 GTK_VER=1.3 -GLIB = ..\..\..\glib-$(GLIB_VER) -CFLAGS = -I. -I..\.. -I$(WTKIT)\include -I$(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" # -DMULTIPLE_WINDOW_CLASSES +GLIB = ..\..\..\glib +CFLAGS = -I. -I..\.. -I$(WTKIT)\include -I$(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" all: \ ..\..\config.h \ |