From 6669d0f7f8efc3fbe591aaba20fe1a9340d69228 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 29 Sep 2010 22:03:04 +0200 Subject: some makeinc cleanup --- src/makeinc.skel | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/makeinc.skel b/src/makeinc.skel index 3d4cb287..a8b5933f 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -1,6 +1,7 @@ CC = cl LINK = link -CFLAGS = $(CFLAGS) /Ox /c /MD /MP2 /W0 /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /DG_DISABLE_DEPRECATED /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 /DHAVE_STRTOULL -DUSE_IPV6 +CFLAGS = $(CFLAGS) /Ox /c /MD /MP2 /W0 /nologo +CFLAGS = $(CFLAGS) /DWIN32 /DG_DISABLE_CAST_CHECKS /DG_DISABLE_DEPRECATED /DGDK_PIXBUF_DISABLE_DEPRECATED /DUSE_IPV6 /DHAVE_STRTOULL /Dstrtoull=_strtoui64 /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp CFLAGS = $(CFLAGS) -Ic:\mozilla-build\build\xchat-wdk\plugins CPPFLAGS = /c /MD /W0 /nologo /DWIN32 LDFLAGS = /subsystem:windows /nologo @@ -12,7 +13,7 @@ LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib DEV64 = c:\mozilla-build\build\xchat-dev64 GLIB = -I$(DEV64)\include -I$(DEV64)\include\glib-2.0 -I$(DEV64)\lib\glib-2.0\include -GTK = -I$(DEV64)\include\gtk-2.0 -I$(DEV64)\lib\gtk-2.0\include -I$(DEV64)\include\atk-1.0 -I$(DEV64)\include\cairo -I$(DEV64)\include\pango-1.0 -I$(DEV64)\include\glib-2.0 -I$(DEV64)\lib\glib-2.0\include -I$(DEV64)\include\gdk-pixbuf-2.0 +GTK = -I$(DEV64)\include\gtk-2.0 -I$(DEV64)\lib\gtk-2.0\include -I$(DEV64)\include\atk-1.0 -I$(DEV64)\include\cairo -I$(DEV64)\include\pango-1.0 -I$(DEV64)\include\gdk-pixbuf-2.0 LIBS = $(LIBS) /libpath:$(DEV64)\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x64 @@ -32,7 +33,7 @@ TCLPATH = c:\mozilla-build\tcl-8.5-x64 DEV32 = c:\mozilla-build\build\xchat-dev32 GLIB = -I$(DEV32)\include -I$(DEV32)\include\glib-2.0 -I$(DEV32)\lib\glib-2.0\include -GTK = -I$(DEV32)\include\gtk-2.0 -I$(DEV32)\lib\gtk-2.0\include -I$(DEV32)\include\atk-1.0 -I$(DEV32)\include\cairo -I$(DEV32)\include\pango-1.0 -I$(DEV32)\include\glib-2.0 -I$(DEV32)\lib\glib-2.0\include -I$(DEV32)\include\gdk-pixbuf-2.0 +GTK = -I$(DEV32)\include\gtk-2.0 -I$(DEV32)\lib\gtk-2.0\include -I$(DEV32)\include\atk-1.0 -I$(DEV32)\include\cairo -I$(DEV32)\include\pango-1.0 -I$(DEV32)\include\gdk-pixbuf-2.0 LIBS = $(LIBS) /libpath:$(DEV32)\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x86 -- cgit 1.4.1