From df49b9412d3ee3ffd1cacef7f0f844d10c4c31b9 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 16 Aug 2010 14:39:35 +0200 Subject: some heavy restructuring and reformatting --- src/makeinc.mak | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/makeinc.mak b/src/makeinc.mak index de2fa1d5..1b912364 100644 --- a/src/makeinc.mak +++ b/src/makeinc.mak @@ -1,6 +1,5 @@ #X64 = YES #PORTABLE = YES -OPENSSL = YES IPV6 = YES CC = cl @@ -9,6 +8,7 @@ CFLAGS = $(CFLAGS) /Ox /c /MD /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /Dstrcasec CPPFLAGS = /c /MD /nologo /DWIN32 LDFLAGS = /subsystem:windows /nologo LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib + !ifdef X64 ############################################################# #x64 config @@ -16,11 +16,15 @@ GLIB = -Ic:/mozilla-build/build/xchat-dev64/include/glib-2.0 -Ic:/mozilla-build/ GTK = -Ic:/mozilla-build/build/xchat-dev64/include/gtk-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/gtk-2.0/include -Ic:/mozilla-build/build/xchat-dev64/include/atk-1.0 -Ic:/mozilla-build/build/xchat-dev64/include/cairo -Ic:/mozilla-build/build/xchat-dev64/include/pango-1.0 -Ic:/mozilla-build/build/xchat-dev64/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/glib-2.0/include -Ic:/mozilla-build/build/xchat-dev64/include/freetype2 -Ic:/mozilla-build/build/xchat-dev64/include -Ic:/mozilla-build/build/xchat-dev64/include/libpng14 LIBS = $(LIBS) /libpath:c:/mozilla-build/build/xchat-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 gdi32.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 +CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include +LIBS = $(LIBS) /libpath:$(OPENSSLPATH)\lib libeay32.lib ssleay32.lib + CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64 CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj -LUAPATH = c:\mozilla-build\lua-5.1-x64 +LUAPATH = c:\mozilla-build\build\lua-wdk-5.1.4-2-x64 PERLPATH = c:\mozilla-build\perl-5.12-x64\lib\CORE PYTHONPATH = c:\mozilla-build\python-2.6-x64 TCLPATH = c:\mozilla-build\tcl-8.5-x64 @@ -31,12 +35,16 @@ GLIB = -Ic:/mozilla-build/build/xchat-dev32/include/glib-2.0 -Ic:/mozilla-build/ GTK = -Ic:/mozilla-build/build/xchat-dev32/include/gtk-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/gtk-2.0/include -Ic:/mozilla-build/build/xchat-dev32/include/atk-1.0 -Ic:/mozilla-build/build/xchat-dev32/include/cairo -Ic:/mozilla-build/build/xchat-dev32/include/pango-1.0 -Ic:/mozilla-build/build/xchat-dev32/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/glib-2.0/include -Ic:/mozilla-build/build/xchat-dev32/include/freetype2 -Ic:/mozilla-build/build/xchat-dev32/include -Ic:/mozilla-build/build/xchat-dev32/include/libpng14 LIBS = $(LIBS) /libpath:c:/mozilla-build/build/xchat-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 gdi32.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 +CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include +LIBS = $(LIBS) /libpath:$(OPENSSLPATH)\lib libeay32.lib ssleay32.lib + SPELL = -Ic:\mozilla-build\build\gtkspell-x86\include\gtkspell-2.0 #LIBS = $(LIBS) /libpath:c:\mozilla-build\build\gtkspell-x86\lib libgtkspell.a LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj -LUAPATH = c:\mozilla-build\lua-5.1-x86 +LUAPATH = c:\mozilla-build\build\lua-wdk-5.1.4-2-x86 PERLPATH = c:\mozilla-build\perl-5.12-x86\lib\CORE PYTHONPATH = c:\mozilla-build\python-2.6-x86 TCLPATH = c:\mozilla-build\tcl-8.5-x86 @@ -68,12 +76,6 @@ LIBS = $(LIBS) ws2_32.lib LIBS = $(LIBS) wsock32.lib !endif -!ifdef OPENSSL -CFLAGS = $(CFLAGS) /DUSE_OPENSSL -LIBS = $(LIBS) libeay32.lib ssleay32.lib -SSLOBJ = ssl.obj -!endif - COMMON_OBJECTS = \ cfgfiles.obj \ chanopt.obj \ @@ -91,7 +93,7 @@ plugin-timer.obj \ proto-irc.obj \ server.obj \ servlist.obj \ -$(SSLOBJ) \ +ssl.obj \ text.obj \ tree.obj \ url.obj \ -- cgit 1.4.1