Various fixes for compiling under Windows.

Also updated ms_* modules to use std::vector Memo struct from earlier commit.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1797 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 18 insertions, 93 deletions

diff --git a/makefile.inc.win32 b/makefile.inc.win32
index 75567aa2a..f9b06845a 100644
--- a/makefile.inc.win32
+++ b/makefile.inc.win32
@@ -1,93 +1,18 @@
-#
-# Anope IRC Services 1.7.9 for Windows
-#
-#  Contact us at info@anope.org
-#
-# Please read COPYING and README for further details.
-#
-# Based on the original code of Epona by Lara.
-# Based on the original code of Services by Andy Church.
-#
-
-# Please read and edit the configurations options below.
-
-
-# Set this to 1 to enable MySQL support
-USE_MYSQL=0
-# Set this to the path where the MySQL includes can be found
-#MYSQL_INC="c:\\mysql\\include\\"
-# Set this to the path where the MySQL libraries can be found
-#MYSQL_LIB="c:\\mysql\\lib\\opt\\"
-
-# Set this to 1 to enable database encryption
-DB_ENCRYPTION=0
-
-# If you want to change the names/locations of files/folders, you
-# can do that here.
-PROGRAM=anope.exe
-DATDEST=data
-
-# If you are compiling using VC6, or get __ftol2 errors, please uncomment
-# the following line:
-#VC6=/QIfist
-
-# If you are getting errors such as 'Cannot find wsock32.lib', then change
-# the following line to the path where the library files can be found.
-#
-#  Eg: LIBPATH=C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib
-#
-LIBPATH=
-
-# If you edited the line above, uncomment the next line.
-#LFLAGS=/LIBPATH:"$(LIBPATH)"
-
-
-###############################################################
-#Don't touch anything below unless you know what you are doing#
-###############################################################
-
-
-CC=cl
-RC=rc
-MAKE=nmake -f Makefile.win32
-BASE_CFLAGS=/O2 /MD
-LIBS=wsock32.lib advapi32.lib /NODEFAULTLIB:libcmtd.lib
-ELIBS=
-MLIBS=
-
-!IF $(USE_MYSQL) == 1
-!IF $(MYSQL_LIB) != ""
-LIBS=$(LIBS) /LIBPATH:$(MYSQL_LIB)
-MYSQL_LIB_PATH=/LIBPATH:$(MYSQL_LIB)
-!ENDIF
-!IF $(MYSQL_INC) != ""
-BASE_CFLAGS=$(BASE_CFLAGS) /I $(MYSQL_INC)
-MYSQL_INC_PATH=/I $(MYSQL_INC)
-!ENDIF
-BASE_CFLAGS=$(BASE_CFLAGS)
-
-MYPASQL_BUILD=$(CC) /LD $(MYSQL_INC_PATH) src\mypasql.c /link $(MYSQL_LIB_PATH) $(LFLAGS) \
-/DEF:src\mypasql.def libmysql.lib zlib.lib ws2_32.lib advapi32.lib /NODEFAULTLIB:LIBCMTD.lib
-
-LIBS=$(LIBS) libmysql.lib zlib.lib
-!ENDIF
-
-!IF $(DB_ENCRYPTION) == 1
-BASE_CFLAGS=/D USE_ENCRYPTION /D ENCRYPT_MD5 $(BASE_CFLAGS)
-!ENDIF
-
-# Note that changing any of these options (or, in fact, anything in this
-# file) will automatically cause a full rebuild of Services.
-
-# Compilation options:
-#        -DCLEAN_COMPILE         Attempt to compile without any warnings (note that
-#                            this may reduce performance)
-
-CDEFS =
-
-# Add any extra flags you want here.  The default line enables warnings and
-# debugging symbols on GCC.  If you have a non-GCC compiler, you may want
-# to comment it out or change it.
-
-MORE_CFLAGS = /I"../include"
-CFLAGS = /nologo $(VC6) $(CDEFS) $(BASE_CFLAGS) $(MORE_CFLAGS)
+#

+# Generated by install.js

+#

+LIBPATH=/LIBPATH:"C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\Lib" /LIBPATH:"C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\Lib" 

+INCFLAGS=/I "C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\Include" /I "C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\Include" 

+VERSION=1.9.0.0-git

+PROGRAM=anope.exe

+DATDEST=data

+CC=cl

+RC=rc

+MAKE=nmake -f Makefile.win32

+BASE_CFLAGS=$(VC6) /O2 /MD /TP /GR /EHsc $(INCFLAGS)

+RC_FLAGS=/i "C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\Include" /i "C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\Include" 

+LIBS=wsock32.lib advapi32.lib /NODEFAULTLIB:libcmtd.lib

+LFLAGS=$(LIBPATH)

+USE_MYSQL=0

+MORE_CFLAGS = /I"../include"

+CFLAGS = /nologo $(CDEFS) $(BASE_CFLAGS) $(MORE_CFLAGS)