summaryrefslogtreecommitdiff
path: root/src/mod_irc
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2004-03-21 20:27:09 +0000
committerAlexey Shchepin <alexey@process-one.net>2004-03-21 20:27:09 +0000
commitb75fb79677a90fd1885eb43c98158910da940ff5 (patch)
tree170af57c951451edd08c09409f1200f3f0a17fb0 /src/mod_irc
parent* doc/guide.tex: Updated (diff)
* (all): Updated win32 stuff (thanks to Sergei Golovan)
* src/web/ejabberd_web.erl: Added interface for access rules configuration SVN Revision: 221
Diffstat (limited to 'src/mod_irc')
-rw-r--r--src/mod_irc/Makefile.win326
-rw-r--r--src/mod_irc/iconv_erl.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mod_irc/Makefile.win32 b/src/mod_irc/Makefile.win32
index 515f5432..c87bb286 100644
--- a/src/mod_irc/Makefile.win32
+++ b/src/mod_irc/Makefile.win32
@@ -20,7 +20,7 @@ CLEAN :
-@erase iconv_erl.obj
-@erase iconv_erl.pch
-@erase vc60.idb
- -@erase *.beam
+ -@erase $(OBJS)
$(OUTDIR)\iconv.beam : iconv.erl
erlc -W $(EFLAGS) -o $(OUTDIR) iconv.erl
@@ -32,7 +32,7 @@ $(OUTDIR)\mod_irc_connection.beam : mod_irc_connection.erl
erlc -W $(EFLAGS) -o $(OUTDIR) mod_irc_connection.erl
CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "$(ERLANG_DIR)\usr\include" /I "$(EI_DIR)\include" /I "$(GNUWIN_DIR)\include" /D "WIN32" /D "NDEBUG" /D "_USRDLL" /D "_MBCS" /Fpiconv_erl.pch /YX /FD /c
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "$(ERLANG_DIR)\usr\include" /I "$(EI_DIR)\include" /I "$(GNUWIN_DIR)\include" /D "__WIN32__" /D "WIN32" /D "NDEBUG" /D "_USRDLL" /D "_MBCS" /Fpiconv_erl.pch /YX /FD /c
.c.obj::
$(CPP) @<<
@@ -40,7 +40,7 @@ CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "$(ERLANG_DIR)\usr\include" /I "$(EI_DIR)\in
<<
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib "$(ERLANG_DIR)\usr\lib\erl_dll.lib" "$(EI_DIR)\lib\ei.lib" "$(EI_DIR)\lib\erl_interface.lib" "$(GNUWIN_DIR)\lib\libiconv.lib" /nologo /subsystem:console /dll /pdb:none /machine:I386 /out:$(OUTDIR)\iconv_erl.dll
+LINK32_FLAGS=kernel32.lib "$(EI_DIR)\lib\ei.lib" "$(EI_DIR)\lib\erl_interface.lib" "$(GNUWIN_DIR)\lib\libiconv.lib" /nologo /subsystem:console /dll /pdb:none /machine:I386 /out:$(OUTDIR)\iconv_erl.dll /nodefaultlib:libcmt
LINK32_OBJS=iconv_erl.obj
$(OUTDIR)\iconv_erl.dll : $(LINK32_OBJS)
diff --git a/src/mod_irc/iconv_erl.c b/src/mod_irc/iconv_erl.c
index de991418..923f5cc6 100644
--- a/src/mod_irc/iconv_erl.c
+++ b/src/mod_irc/iconv_erl.c
@@ -1,6 +1,7 @@
/* $Id$ */
#include <stdio.h>
+#include <string.h>
#include <erl_driver.h>
#include <ei.h>
#include <iconv.h>