summaryrefslogtreecommitdiff
path: root/gdk/win32/makefile.msc
diff options
context:
space:
mode:
authorTor Lillqvist <tml@src.gnome.org>1999-07-12 23:12:39 +0000
committerTor Lillqvist <tml@src.gnome.org>1999-07-12 23:12:39 +0000
commite3c310e538cb4584c38f36f3a86863685c51d62f (patch)
treec23182d643b66b46eaaa1af9eae2169999e4b0ac /gdk/win32/makefile.msc
parentaf663f9a3a250c54b8b71cc7e4dcd01853e8922b (diff)
downloadgtk+-e3c310e538cb4584c38f36f3a86863685c51d62f.tar.gz
Less logging verbiage.
* gdk/win32/gdkdraw.c (gdk_draw_pixmap): Less logging verbiage. * gdk/win32/gdkevents.c: Fix long-standing bug in key events. The key.string wasn't zero-terminated, still we strdup'ed it in gdk_event_copy(). Synthesize crossing events for button events before possible propagation. * gdk/win32/gdkwindow.c: Log gdk_window_set_title. * gdk/win32/makefile.cygwin * gtk/makefile.cygwin: Use new DLL naming style for the GCC-compiled ones. * gdk/win32/makefile.msc * gtk/makefile.msc: Cosmetics mostly. * gtk/gtk.def: Add missing entry points. * gtk/gtksocket.c: Add dummy gtk_socket_get_type() for Win32.
Diffstat (limited to 'gdk/win32/makefile.msc')
-rw-r--r--gdk/win32/makefile.msc31
1 files changed, 12 insertions, 19 deletions
diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc
index 7d6618d286..d8faa49fa6 100644
--- a/gdk/win32/makefile.msc
+++ b/gdk/win32/makefile.msc
@@ -8,21 +8,25 @@ BIN = C:\bin
# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
WTKIT = ..\..\..\wtkit126
-# Full optimization:
-OPTIMIZE = -Ox
-# Debugging:
-#OPTIMIZE = -Zi
-
################################################################
# Nothing much configurable below
+!IFNDEF DEBUG
+# Full optimization:
+OPTIMIZE = -Ox -MD
+LINKDEBUG =
+!ELSE
+# Debugging:
+OPTIMIZE = -Zi -MDd
+LINKDEBUG = /debug
+!ENDIF
+
# cl -? describes the options
-CC = cl -G5 -GF $(OPTIMIZE) -W3 -MD -nologo
+CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
-LDFLAGS = /link /machine:ix86 # /debug
+LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
INSTALL = copy
-TOUCH = copy makefile.msc+nul
GLIB_VER=1.3
GTK_VER=1.3
@@ -35,11 +39,9 @@ all: \
gdk\gdkx.h \
..\..\config.h \
gdk-$(GTK_VER).dll
- $(TOUCH) all
install : all
$(INSTALL) gdk-$(GTK_VER).dll $(BIN)
- $(TOUCH) install
gdk_OBJECTS = \
gdk.obj \
@@ -103,13 +105,6 @@ gdkrgb.c : ..\gdkrgb.c
gdkrectangle.c : ..\gdkrectangle.c
copy ..\gdkrectangle.c .
-
-testgdk.exe : testgdk.obj gdk-$(GTK_VER).dll
- $(CC) $(CFLAGS) testgdk.obj gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
-
-testgdk.obj : testgdk.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgdk\" testgdk.c
-
clean:
del *.exe
del *.obj
@@ -119,8 +114,6 @@ clean:
del *.err
del *.map
del *.sym
- del *.lk1
- del *.mk1
del *.res
del *.pdb
del *.ilk