some heavy restructuring and reformatting

13 files changed, 67 insertions, 35 deletions

diff --git a/build/build-x64.bat b/build/build-x64.bat
index 7d1e9fad..7f1c3686 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -1,6 +1,6 @@
 @echo off
-set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev64\include;c:\mozilla-build\build\openssl-1.0.0a-wdk-x64\include
-set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\mozilla-build\build\openssl-1.0.0a-wdk-x64\lib
+set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev64\include
+set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64
 set OPATH=%PATH%
 set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\build\xchat-dev64\bin;c:\mozilla-build\perl-5.12-x64\bin
 cd ..\src
diff --git a/build/build-x86.bat b/build/build-x86.bat
index 5349ae03..5d28ce5e 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -1,6 +1,6 @@
 @echo off
-set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include;c:\mozilla-build\build\openssl-1.0.0a-wdk-x86\include
-set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\mozilla-build\build\openssl-1.0.0a-wdk-x86\lib
+set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include
+set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
 set OPATH=%PATH%
 set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw32\bin;c:\mozilla-build\perl-5.12-x86\bin
 cd ..\src
diff --git a/build/release-x64.bat b/build/release-x64.bat
index 571debe9..65f4c09b 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -1,7 +1,7 @@
 @echo off
 set GTK_BIN=c:\mozilla-build\build\xchat-dev64\bin
-set SSL_BIN=c:\mozilla-build\build\openssl-1.0.0a-wdk-x64\bin
-set LUA_BIN=c:\mozilla-build\build\lua-5.1.4-2-wdk-x64
+set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x64\bin
+set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x64\bin
 set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x64
 rmdir /Q /S %XCHAT_DEST%
 mkdir %XCHAT_DEST%
diff --git a/build/release-x86.bat b/build/release-x86.bat
index 6b65e030..2286894b 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -1,7 +1,7 @@
 @echo off
 set GTK_BIN=c:\mozilla-build\build\xchat-dev32\bin
-set SSL_BIN=c:\mozilla-build\build\openssl-1.0.0a-wdk-x86\bin
-set LUA_BIN=c:\mozilla-build\build\lua-5.1.4-2-wdk-x86
+set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x86\bin
+set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x86\bin
 set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x86
 rmdir /Q /S %XCHAT_DEST%
 mkdir %XCHAT_DEST%
diff --git a/ext/lua-wdk/build-x64.bat b/ext/lua-wdk/build-x64.bat
index 32c8b7b7..b0feed5a 100644
--- a/ext/lua-wdk/build-x64.bat
+++ b/ext/lua-wdk/build-x64.bat
@@ -3,15 +3,30 @@ set OPATH=%PATH%
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk

 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64

 set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin

-set DEST=..\lua-5.1.4-2-wdk-x64

+set DEST=..\lua-wdk-5.1.4-2-x64

 call etc\luavs-x64.bat

 @echo off

 echo.Press return when ready to install!

 pause

 set PATH=%OPATH%

 rmdir /Q /S %DEST%

-xcopy /S /I src %DEST%

+mkdir %DEST%

+mkdir %DEST%\bin

+mkdir %DEST%\lib

+mkdir %DEST%\include

 xcopy COPYRIGHT %DEST%

-del %DEST%\Makefile

+:: binaries and libraries

+xcopy src\lua.exe %DEST%\bin

+xcopy src\lua51.dll %DEST%\bin

+xcopy src\lua51.exp %DEST%\bin

+xcopy src\luac.exe %DEST%\bin

+:: library

+xcopy src\lua51.lib %DEST%\lib

+:: api

+xcopy src\lua.h %DEST%\include

+xcopy src\luaconf.h %DEST%\include

+xcopy src\lualib.h %DEST%\include

+xcopy src\lauxlib.h %DEST%\include

+xcopy etc\lua.hpp %DEST%\include

 echo.Finished!

 pause

diff --git a/ext/lua-wdk/build-x86.bat b/ext/lua-wdk/build-x86.bat
index a5cebfd9..e912a472 100644
--- a/ext/lua-wdk/build-x86.bat
+++ b/ext/lua-wdk/build-x86.bat
@@ -3,15 +3,30 @@ set OPATH=%PATH%
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk

 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386

 set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin

-set DEST=..\lua-5.1.4-2-wdk-x86

+set DEST=..\lua-wdk-5.1.4-2-x86

 call etc\luavs.bat

 @echo off

 echo.Press return when ready to install!

 pause

 set PATH=%OPATH%

 rmdir /Q /S %DEST%

-xcopy /S /I src %DEST%

+mkdir %DEST%

+mkdir %DEST%\bin

+mkdir %DEST%\lib

+mkdir %DEST%\include

 xcopy COPYRIGHT %DEST%

-del %DEST%\Makefile

+:: binaries and libraries

+xcopy src\lua.exe %DEST%\bin

+xcopy src\lua51.dll %DEST%\bin

+xcopy src\lua51.exp %DEST%\bin

+xcopy src\luac.exe %DEST%\bin

+:: library

+xcopy src\lua51.lib %DEST%\lib

+:: api

+xcopy src\lua.h %DEST%\include

+xcopy src\luaconf.h %DEST%\include

+xcopy src\lualib.h %DEST%\include

+xcopy src\lauxlib.h %DEST%\include

+xcopy etc\lua.hpp %DEST%\include

 echo.Finished!

 pause

diff --git a/ext/openssl-wdk/build-x64.bat b/ext/openssl-wdk/build-x64.bat
index 27ebbbff..cc57f8d0 100644
--- a/ext/openssl-wdk/build-x64.bat
+++ b/ext/openssl-wdk/build-x64.bat
@@ -2,7 +2,7 @@
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk;c:\mozilla-build\build\openssl-1.0.0a\ms;c:\mozilla-build\build\zlib-x64\include

 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\mozilla-build\build\zlib-x64\lib

 set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\perl-5.12-x64\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x64\bin\

-perl Configure VC-WIN64A enable-camellia no-asm zlib-dynamic --openssldir=c:/mozilla-build/build/openssl-1.0.0a-wdk-x64

+perl Configure VC-WIN64A enable-camellia no-asm zlib-dynamic --openssldir=c:/mozilla-build/build/openssl-wdk-1.0.0a-x64

 call ms\do_win64a

 nmake -f ms\ntdll.mak vclean

 nmake -f ms\ntdll.mak

@@ -10,5 +10,5 @@ nmake -f ms\ntdll.mak test
 echo.Press return when ready to install!

 pause

 nmake -f ms\ntdll.mak install

-perl util\copy.pl c:/mozilla-build/build/zlib-x64/bin/zlib1.dll c:/mozilla-build/build/openssl-1.0.0a-wdk-x64/bin

+perl util\copy.pl c:/mozilla-build/build/zlib-x64/bin/zlib1.dll c:/mozilla-build/build/openssl-wdk-1.0.0a-x64/bin

 echo.Finished!

diff --git a/ext/openssl-wdk/build-x86.bat b/ext/openssl-wdk/build-x86.bat
index a5894b39..77a31dfc 100644
--- a/ext/openssl-wdk/build-x86.bat
+++ b/ext/openssl-wdk/build-x86.bat
@@ -2,7 +2,7 @@
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk;c:\mozilla-build\build\openssl-1.0.0a\ms;c:\mozilla-build\build\zlib-x86\include

 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\mozilla-build\build\zlib-x86\lib

 set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\perl-5.12-x86\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x86\bin

-perl Configure VC-WIN32 enable-camellia zlib-dynamic --openssldir=c:/mozilla-build/build/openssl-1.0.0a-wdk-x86

+perl Configure VC-WIN32 enable-camellia zlib-dynamic --openssldir=c:/mozilla-build/build/openssl-wdk-1.0.0a-x86

 call ms\do_nasm

 @echo off

 nmake -f ms\ntdll.mak vclean

@@ -11,5 +11,5 @@ nmake -f ms\ntdll.mak test
 echo.Press return when ready to install!

 pause

 nmake -f ms\ntdll.mak install

-perl util\copy.pl c:/mozilla-build/build/zlib-x86/bin/zlib1.dll c:/mozilla-build/build/openssl-1.0.0a-wdk-x86/bin

+perl util\copy.pl c:/mozilla-build/build/zlib-x86/bin/zlib1.dll c:/mozilla-build/build/openssl-wdk-1.0.0a-x86/bin

 echo.Finished!

diff --git a/plugins/lua/makefile.mak b/plugins/lua/makefile.mak
index 2b9a18ee..3059660d 100644
--- a/plugins/lua/makefile.mak
+++ b/plugins/lua/makefile.mak
@@ -1,7 +1,7 @@
 include "..\..\src\makeinc.mak"

 

 xclua.dll: lua.obj lua.def

-	link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll /LIBPATH:$(LUAPATH) $(LUALIB).lib /def:lua.def lua.obj 

+	link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll /libpath:$(LUAPATH)\lib $(LUALIB).lib /def:lua.def lua.obj 

 	dir xclua.dll

 

 lua.def:

@@ -10,7 +10,7 @@ lua.def:
 	echo xchat_plugin_deinit >> lua.def

 

 lua.obj: lua.c makefile.mak

-	cl $(CFLAGS) /Dsnprintf=g_snprintf /I.. /I$(LUAPATH) /I.. lua.c

+	cl $(CFLAGS) /Dsnprintf=g_snprintf /I.. /I$(LUAPATH)\include /I.. lua.c

 

 clean:

 	del *.obj

diff --git a/plugins/perl/makefile.mak b/plugins/perl/makefile.mak
index d3a5c967..3d79f794 100644
--- a/plugins/perl/makefile.mak
+++ b/plugins/perl/makefile.mak
@@ -19,7 +19,7 @@ xchat.pm.h: Xchat.pm IRC.pm
 	perl.exe generate_header
 
 $(TARGET): perl.obj perl.def
-	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /LIBPATH:$(PERLPATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
+	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERLPATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
 
 clean:
 	del $(TARGET)
diff --git a/plugins/python/makefile.mak b/plugins/python/makefile.mak
index 2133065e..1b71f40c 100644
--- a/plugins/python/makefile.mak
+++ b/plugins/python/makefile.mak
@@ -11,10 +11,10 @@ python.def:
 	echo xchat_plugin_get_info >> python.def
 
 python.obj: python.c
-	$(CC) $(CFLAGS) /Dusleep=_sleep /DPATH_MAX=255 python.c $(GLIB) /I.. /I$(PYTHONPATH)\INCLUDE /DPYTHON_DLL=\"$(PYTHONLIB).dll\"
+	$(CC) $(CFLAGS) /Dusleep=_sleep /DPATH_MAX=255 python.c $(GLIB) /I.. /I$(PYTHONPATH)\include /DPYTHON_DLL=\"$(PYTHONLIB).dll\"
 
 $(TARGET): python.obj python.def
-	$(LINK) /DLL /out:$(TARGET) $(LDFLAGS) python.obj /LIBPATH:$(PYTHONPATH)\LIBS $(PYTHONLIB).lib $(LIBS) /def:python.def
+	$(LINK) /DLL /out:$(TARGET) $(LDFLAGS) python.obj /libpath:$(PYTHONPATH)\libs $(PYTHONLIB).lib $(LIBS) /def:python.def
 
 clean:
 	del $(TARGET)
diff --git a/plugins/tcl/makefile.mak b/plugins/tcl/makefile.mak
index 5f43ebb7..51d31efb 100644
--- a/plugins/tcl/makefile.mak
+++ b/plugins/tcl/makefile.mak
@@ -11,10 +11,10 @@ tcl.def:
 	echo xchat_plugin_get_info >> tcl.def
 
 tclplugin.obj: tclplugin.c
-	$(CC) $(CFLAGS) tclplugin.c /I$(TCLPATH)\INCLUDE /I../../include /I.. /DTCL_DLL=\"$(TCLLIB).dll\"
+	$(CC) $(CFLAGS) tclplugin.c /I$(TCLPATH)\include /I../../include /I.. /DTCL_DLL=\"$(TCLLIB).dll\"
 
 $(TARGET): tclplugin.obj tcl.def
-	$(LINK) /DLL /out:$(TARGET) $(LDFLAGS) tclplugin.obj /LIBPATH:$(TCLPATH)\LIB $(TCLLIB).lib /DELAYLOAD:$(TCLLIB).dll DELAYIMP.LIB /def:tcl.def
+	$(LINK) /DLL /out:$(TARGET) $(LDFLAGS) tclplugin.obj /libpath:$(TCLPATH)\lib $(TCLLIB).lib /DELAYLOAD:$(TCLLIB).dll DELAYIMP.LIB /def:tcl.def
 
 clean:
 	del $(TARGET)
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 \