From 99318adcb88fa3f1dd21882ec364e682fec96c5e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 7 Nov 2005 17:32:40 +0100 Subject: Import work on services-based Win32 port --- win32/BUILD.TXT | 5 +-- win32/bitlbee.dsp | 85 ++++++++----------------------------------------- win32/bitlbee.dsw | 24 ++++++++++---- win32/configure.mingw32 | 37 --------------------- 4 files changed, 35 insertions(+), 116 deletions(-) delete mode 100644 win32/configure.mingw32 (limited to 'win32') diff --git a/win32/BUILD.TXT b/win32/BUILD.TXT index 718152b7..03e1b8d9 100644 --- a/win32/BUILD.TXT +++ b/win32/BUILD.TXT @@ -4,10 +4,11 @@ Instructions for building the Bitlbee Win32 port 1. Download the latest version using bzr (http://www.bazaar-ng.org/): bzr branch http://jelmer.vernstok.nl/oss/bitlbee/bzr/win32 bitlbee-win32 2. Download and install the required development files: - from http://www.ethereal.com/distribution/win32/development/: - - libiconv + from ftp://ftp.gtk.org/pub/gtk/v2.8/win32/ - glib - glib-dev + - libiconv + - gettext from http://ftp.mozilla.org/pub/mozilla.org/ - nss - nspr diff --git a/win32/bitlbee.dsp b/win32/bitlbee.dsp index ef0f3ada..3f26fca0 100644 --- a/win32/bitlbee.dsp +++ b/win32/bitlbee.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "GLIB2" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib iconv.lib glib-2.0.lib gmodule-2.0.lib /nologo /subsystem:windows /machine:I386 /libpath:"release" /libpath:"deps\lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib iconv.lib glib-2.0.lib gmodule-2.0.lib wsock32.lib advapi32.lib /nologo /subsystem:windows /machine:I386 /libpath:"release" /libpath:"deps\lib" # SUBTRACT LINK32 /incremental:yes /nodefaultlib !ELSEIF "$(CFG)" == "bitlbee - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "GLIB2" /FR /FD /c +# ADD CPP /nologo /Gd /MDd /Ze /W3 /Gm /GX /Zi /Od /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 iconv.lib glib-2.0.lib gmodule-2.0.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"debug" /libpath:"deps\lib" +# ADD LINK32 iconv.lib glib-2.0.lib gmodule-2.0.lib wsock32.lib kernel32.lib user32.lib advapi32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"debug" /libpath:"deps\lib" !ENDIF @@ -103,10 +103,13 @@ SOURCE=..\bitlbee.c # Begin Source File SOURCE=.\bitlbee.rc -# End Source File -# Begin Source File -SOURCE=.\bitlbeewin.cpp +!IF "$(CFG)" == "bitlbee - Win32 Release" + +!ELSEIF "$(CFG)" == "bitlbee - Win32 Debug" + +!ENDIF + # End Source File # Begin Source File @@ -130,10 +133,6 @@ SOURCE=..\irc.c # End Source File # Begin Source File -SOURCE=.\MainDlg.cpp -# End Source File -# Begin Source File - SOURCE=..\protocols\md5.c # End Source File # Begin Source File @@ -146,26 +145,6 @@ SOURCE=..\protocols\nogaim.c # End Source File # Begin Source File -SOURCE=.\PropAccess.cpp -# End Source File -# Begin Source File - -SOURCE=.\PropConn.cpp -# End Source File -# Begin Source File - -SOURCE=.\PropLog.cpp -# End Source File -# Begin Source File - -SOURCE=.\PropPaths.cpp -# End Source File -# Begin Source File - -SOURCE=.\PropUsers.cpp -# End Source File -# Begin Source File - SOURCE=..\protocols\proxy.c # End Source File # Begin Source File @@ -182,10 +161,6 @@ SOURCE=..\protocols\sha.c # End Source File # Begin Source File -SOURCE=.\TrayNot.cpp -# End Source File -# Begin Source File - SOURCE=..\user.c # End Source File # Begin Source File @@ -200,6 +175,10 @@ SOURCE=..\protocols\util.c !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\win32.c # End Source File # End Group # Begin Group "Header Files" @@ -215,10 +194,6 @@ SOURCE=..\bitlbee.h # End Source File # Begin Source File -SOURCE=.\bitlbeewin.h -# End Source File -# Begin Source File - SOURCE=..\commands.h # End Source File # Begin Source File @@ -251,10 +226,6 @@ SOURCE=..\log.h # End Source File # Begin Source File -SOURCE=.\MainDlg.h -# End Source File -# Begin Source File - SOURCE=..\protocols\md5.h # End Source File # Begin Source File @@ -267,30 +238,6 @@ SOURCE=..\protocols\nogaim.h # End Source File # Begin Source File -SOURCE=.\PropAccess.h -# End Source File -# Begin Source File - -SOURCE=.\PropConn.h -# End Source File -# Begin Source File - -SOURCE=.\PropLog.h -# End Source File -# Begin Source File - -SOURCE=.\PropPaths.h -# End Source File -# Begin Source File - -SOURCE=.\PropUsers.h -# End Source File -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - SOURCE=..\set.h # End Source File # Begin Source File @@ -303,10 +250,6 @@ SOURCE=..\sock.h # End Source File # Begin Source File -SOURCE=.\TrayNot.h -# End Source File -# Begin Source File - SOURCE=..\user.h # End Source File # End Group diff --git a/win32/bitlbee.dsw b/win32/bitlbee.dsw index e91fea5e..7f446962 100644 --- a/win32/bitlbee.dsw +++ b/win32/bitlbee.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 5.00 ############################################################################### -Project: "bitlbee"=".\bitlbee.dsp" - Package Owner=<4> +Project: "admin"=.\admin1\admin.dsp - Package Owner=<4> Package=<5> {{{ @@ -15,7 +15,7 @@ Package=<4> ############################################################################### -Project: "bitlbee_ssl"=".\bitlbee_ssl\bitlbee_ssl.dsp" - Package Owner=<4> +Project: "bitlbee"=.\bitlbee.dsp - Package Owner=<4> Package=<5> {{{ @@ -27,7 +27,19 @@ Package=<4> ############################################################################### -Project: "jabber"=".\jabber.dsp" - Package Owner=<4> +Project: "bitlbee_ssl"=.\bitlbee_ssl.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "jabber"=.\jabber.dsp - Package Owner=<4> Package=<5> {{{ @@ -45,7 +57,7 @@ Package=<4> ############################################################################### -Project: "msn"=".\msn.dsp" - Package Owner=<4> +Project: "msn"=.\msn.dsp - Package Owner=<4> Package=<5> {{{ @@ -63,7 +75,7 @@ Package=<4> ############################################################################### -Project: "oscar"=".\oscar.dsp" - Package Owner=<4> +Project: "oscar"=.\oscar.dsp - Package Owner=<4> Package=<5> {{{ @@ -78,7 +90,7 @@ Package=<4> ############################################################################### -Project: "yahoo"=".\yahoo.dsp" - Package Owner=<4> +Project: "yahoo"=.\yahoo.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/win32/configure.mingw32 b/win32/configure.mingw32 deleted file mode 100644 index 678e9243..00000000 --- a/win32/configure.mingw32 +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -DEPSDIR=$1 -export PKG_CONFIG_LIBDIR=$DEPSDIR/lib/pkgconfig -export PKG_CONFIG_OPTS=--define-variable=prefix=$DEPSDIR -export PKG_CONFIG="pkg-config $PKG_CONFIG_OPTS" - -cat<config.h -/* BitlBee settings, generated by $0 - - Do *NOT* use any of these defines in your code without thinking twice, most - of them can/will be overridden at run-time */ -#define CPU "i386" -#define IPV6 -#define GLIB2 -#define ARCH "Windows" -EOF - -cat<Makefile.settings -## BitlBee settings, generated by $0 -PREFIX= -BINDIR=\$(PREFIX)/sbin/ -ETCDIR=\$(PREFIX)/etc/bitlbee/ -MANDIR=\$(PREFIX)/share/man/ -DATADIR=\$(PREFIX)/share/bitlbee/ -CONFIG=\$(PREFIX)/lib/bitlbee/ -ARCH=Windows -CPU=i386 -OUTFILE=bitlbee.exe -STRIP=i586-mingw32msvc-strip - -DESTDIR= -LFLAGS=`$PKG_CONFIG --libs glib-2.0` -L$DEPSDIR/lib -lws2_32 -liconv -CFLAGS=`$PKG_CONFIG --cflags glib-2.0` -I$DEPSDIR/include -I`pwd` -I`pwd`/protocols -CC=i586-mingw32msvc-gcc -CXX=i586-mingw32msvc-g++ -LD=i586-mingw32msvc-ld -EOF -- cgit v1.2.3