diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2004-04-15 19:55:38 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2004-04-15 19:55:38 +0000 |
| commit | b542249f115761b97d21d9528d6100aaa84ea9d7 (patch) | |
| tree | 41cd148ea5944fd53193f2ae93c271ae29ff1a19 /src/stringprep | |
| parent | * src/idna.erl: Support for IDNA (RFC3490) (diff) | |
* src/ejabberd.erl: Added searching of files in code:priv_lib
(thanks to Sergei Golovan)
* src/translate.erl: Likewise
* src/ejabberd_app.erl: Added "log_path" configuration parameter
(thanks to Sergei Golovan)
* src/**/Makefile.win32: Updated (thanks to Sergei Golovan)
* src/**/*.c: Updated (thanks to Sergei Golovan)
* src/configure.erl: Added writing of version to Makefile.inc
(thanks to Sergei Golovan)
* doc/guide.tex: Updated link to expat (thanks to Sergei Golovan)
SVN Revision: 223
Diffstat (limited to 'src/stringprep')
| -rw-r--r-- | src/stringprep/Makefile.win32 | 37 | ||||
| -rw-r--r-- | src/stringprep/stringprep_drv.c | 5 |
2 files changed, 17 insertions, 25 deletions
diff --git a/src/stringprep/Makefile.win32 b/src/stringprep/Makefile.win32 index 4f46efda2..37e806a1a 100644 --- a/src/stringprep/Makefile.win32 +++ b/src/stringprep/Makefile.win32 @@ -4,37 +4,32 @@ include ..\Makefile.inc OUTDIR = .. EFLAGS = -I .. -pz .. -ALL : $(OUTDIR)\stringprep_drv.dll $(OUTDIR)\stringprep.beam +SOURCE = stringprep_drv.c +AUXIL = uni_data.c uni_norm.c +OBJECT = stringprep_drv.o +DLL = $(OUTDIR)\stringprep_drv.dll + +ALL : $(DLL) $(OUTDIR)\stringprep.beam CLEAN : - -@erase $(OUTDIR)\stringprep_drv.dll + -@erase $(DLL) -@erase $(OUTDIR)\stringprep_drv.exp -@erase $(OUTDIR)\stringprep_drv.lib - -@erase stringprep_drv.obj - -@erase stringprep_drv.pch - -@erase vc60.idb + -@erase $(OBJECT) -@erase $(OUTDIR)\stringprep.beam $(OUTDIR)\stringprep.beam : stringprep.erl erlc -W $(EFLAGS) -o $(OUTDIR) stringprep.erl -CPP=cl.exe -CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "$(ERLANG_DIR)\usr\include" /I "$(EI_DIR)\include" /D "__WIN32__" /D "WIN32" /D "NDEBUG" /D "_USRDLL" /D "_MBCS" /Fpstringprep_drv.pch /YX /FD /c - -.c.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib "$(EI_DIR)\lib\ei.lib" "$(EI_DIR)\lib\erl_interface.lib" /nologo /subsystem:console /dll /pdb:none /machine:I386 /out:$(OUTDIR)\stringprep_drv.dll /nodefaultlib:libcmt +CC=cl.exe +CC_FLAGS=-nologo -D__WIN32__ -DWIN32 -DWINDOWS -D_WIN32 -DNT -MD -Ox -I"$(ERLANG_DIR)\usr\include" -I"$(EI_DIR)\include" -LINK32_OBJS=stringprep_drv.obj +LD=link.exe +LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib -$(OUTDIR)\stringprep_drv.dll : $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< +$(DLL) : $(OBJECT) + $(LD) $(LD_FLAGS) -out:$(DLL) $(OBJECT) -stringprep_drv.obj : stringprep_drv.c +$(OBJECT) : $(SOURCE) $(AUXIL) + $(CC) $(CC_FLAGS) -c -Fo$(OBJECT) $(SOURCE) diff --git a/src/stringprep/stringprep_drv.c b/src/stringprep/stringprep_drv.c index 2ae83be80..0f6826d9e 100644 --- a/src/stringprep/stringprep_drv.c +++ b/src/stringprep/stringprep_drv.c @@ -325,11 +325,8 @@ ErlDrvEntry stringprep_driver_entry = { NULL /* F_PTR outputv, reserved */ }; -#ifdef WIN32 -__declspec(dllexport) -#endif DRIVER_INIT(stringprep_erl) /* must match name in driver_entry */ { - return &stringprep_driver_entry; + return &stringprep_driver_entry; } |