diff options
Diffstat (limited to 'src/mod_irc')
| -rw-r--r-- | src/mod_irc/Makefile.win32 | 35 | ||||
| -rw-r--r-- | src/mod_irc/iconv_erl.c | 5 |
2 files changed, 16 insertions, 24 deletions
diff --git a/src/mod_irc/Makefile.win32 b/src/mod_irc/Makefile.win32 index c87bb286..f348be8d 100644 --- a/src/mod_irc/Makefile.win32 +++ b/src/mod_irc/Makefile.win32 @@ -11,15 +11,17 @@ OBJS = \ $(OUTDIR)\mod_irc.beam \ $(OUTDIR)\mod_irc_connection.beam -ALL : $(OUTDIR)\iconv_erl.dll $(OBJS) +SOURCE = iconv_erl.c +OBJECT = iconv_erl.o +DLL = $(OUTDIR)\iconv_erl.dll + +ALL : $(DLL) $(OBJS) CLEAN : - -@erase $(OUTDIR)\iconv_erl.dll + -@erase $(DLL) -@erase $(OUTDIR)\iconv_erl.exp -@erase $(OUTDIR)\iconv_erl.lib - -@erase iconv_erl.obj - -@erase iconv_erl.pch - -@erase vc60.idb + -@erase $(OBJECT) -@erase $(OBJS) $(OUTDIR)\iconv.beam : iconv.erl @@ -31,22 +33,15 @@ $(OUTDIR)\mod_irc.beam : mod_irc.erl $(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 "WIN32" /D "NDEBUG" /D "_USRDLL" /D "_MBCS" /Fpiconv_erl.pch /YX /FD /c - -.c.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< +CC=cl.exe +CC_FLAGS=-nologo -D__WIN32__ -DWIN32 -DWINDOWS -D_WIN32 -DNT -MD -Ox -I"$(ERLANG_DIR)\usr\include" -I"$(EI_DIR)\include" -I"$(GNUWIN_DIR)\include" -LINK32=link.exe -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 +LD=link.exe +LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" "$(GNUWIN_DIR)\lib\libiconv.lib" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib -$(OUTDIR)\iconv_erl.dll : $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< +$(DLL) : $(OBJECT) + $(LD) $(LD_FLAGS) -out:$(DLL) $(OBJECT) -iconv_erl.obj : iconv_erl.c +$(OBJECT) : $(SOURCE) + $(CC) $(CC_FLAGS) -c -Fo$(OBJECT) $(SOURCE) diff --git a/src/mod_irc/iconv_erl.c b/src/mod_irc/iconv_erl.c index 923f5cc6..5e986c01 100644 --- a/src/mod_irc/iconv_erl.c +++ b/src/mod_irc/iconv_erl.c @@ -105,12 +105,9 @@ ErlDrvEntry iconv_driver_entry = { NULL /* F_PTR outputv, reserved */ }; -#ifdef WIN32 -__declspec(dllexport) -#endif DRIVER_INIT(iconv_erl) /* must match name in driver_entry */ { - return &iconv_driver_entry; + return &iconv_driver_entry; } |