diff options
| author | Stef Walter <stef@memberwebs.com> | 2004-09-01 01:26:50 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2004-09-01 01:26:50 +0000 |
| commit | 2d51d67c02090ddf2bf2511ada3154606b563753 (patch) | |
| tree | 9065e00e4fdf44b5570d12ebd5014f068463a1e5 | |
| parent | 18f81fefa9fbfb880dc929c4476b9f16f7ac2270 (diff) | |
Win32 Fixes
| -rw-r--r-- | libs/files/domc-library.patch | 11 | ||||
| -rw-r--r-- | libs/files/libmba-library.patch | 18 |
2 files changed, 23 insertions, 6 deletions
diff --git a/libs/files/domc-library.patch b/libs/files/domc-library.patch index 040467d..bed3fc8 100644 --- a/libs/files/domc-library.patch +++ b/libs/files/domc-library.patch @@ -41,8 +41,8 @@ diff -r -U3 domc-0.7.1/Makefile domc/Makefile diff -r -U3 domc-0.7.1/Makefile.msvc domc/Makefile.msvc --- domc-0.7.1/Makefile.msvc 2004-08-04 17:20:02.000000000 -0600 -+++ domc/Makefile.msvc 2004-08-31 18:30:01.061133229 -0600 -@@ -1,22 +1,26 @@ ++++ domc/Makefile.msvc 2004-08-31 19:27:30.565550149 -0600 +@@ -1,22 +1,29 @@ !include <win32.mak> -LIBMBA=..\libmba-0.8.9 -EXPAT=..\Expat-1.95.5 @@ -57,10 +57,13 @@ diff -r -U3 domc-0.7.1/Makefile.msvc domc/Makefile.msvc OBJS=src\expatls.obj src\events.obj src\timestamp.obj src\dom.obj src\node.obj src\namednodemap.obj src\nodelist.obj src\wcwidth.obj +# Debug flags -+cflags=$(cflags) /MLd /GZ /Gm /ZI /Od /D_DEBUG ++# CFLAGS=$(cflags) /MLd /GZ /Gm /ZI /Od /D_DEBUG -domc.dll: $(OBJS) - $(link) /INCREMENTAL:NO /NOLOGO /LIBPATH:$(EXPAT)\Libs /LIBPATH:$(LIBMBA) /LIBPATH:$(ENCDEC) libexpat.lib libmba.lib encdec.lib /DEF:domc.def /OUT:domc.dll -entry:_DllMainCRTStartup@12 -dll $(OBJS) ++# Normal Flags ++CFLAGS=$(cflags) /ML ++ +all: domc.lib + +# domc.dll: $(OBJS) @@ -71,7 +74,7 @@ diff -r -U3 domc-0.7.1/Makefile.msvc domc/Makefile.msvc .c.obj: - $(cc) $(cflags) /I$(EXPAT)\Source\lib /I$(ENCDEC)\src /I$(LIBMBA)\src /Fo$@ $*.c -+ $(cc) $(cflags) /I$(LIBMBA)\src /Fo$@ $*.c ++ $(cc) $(CFLAGS) /I$(LIBMBA)\src /Fo$@ $*.c clean: del domc.dll domc.lib domc.exp $(OBJS) diff --git a/libs/files/libmba-library.patch b/libs/files/libmba-library.patch index f9c8be9..de26d5d 100644 --- a/libs/files/libmba-library.patch +++ b/libs/files/libmba-library.patch @@ -24,8 +24,22 @@ diff -r -U3 libmba-0.8.10/Makefile libmba/Makefile gcc -Wall -W -DTEST -DMSGNO -lmba -lutil -o sho src/shellout.c diff -r -U3 libmba-0.8.10/Makefile.msvc libmba/Makefile.msvc --- libmba-0.8.10/Makefile.msvc 2004-08-27 22:41:52.000000000 -0600 -+++ libmba/Makefile.msvc 2004-08-31 19:18:53.670918401 -0600 -@@ -13,6 +13,7 @@ ++++ libmba/Makefile.msvc 2004-08-31 19:26:49.998837317 -0600 +@@ -3,16 +3,17 @@ + # + # Debug options + # +-cflags=$(cflags) /MDd /GZ /Gm /ZI /Od /Isrc /I$(EXPAT)\Source\lib /D_DEBUG /DWIN32 /D_WINDOWS /DUNICODE /D_UNICODE /D_USRDLL /DLIBMBA_EXPORTS /DUSE_WCHAR /DMSGNO +-lflags=/nologo /dll /debug /pdbtype:sept ++# cflags=$(cflags) /MLd /GZ /Gm /ZI /Od /Isrc /I$(EXPAT)\Source\lib /D_DEBUG /DWIN32 /D_WINDOWS /DUNICODE /D_UNICODE /D_USRDLL /DLIBMBA_EXPORTS /DUSE_WCHAR /DMSGNO ++# lflags=/nologo /dll /debug /pdbtype:sept + + # Production options + # +-#cflags=$(cflags) /Isrc /I$(EXPAT)\Source\lib /DWIN32 /D_WINDOWS /DUNICODE /D_UNICODE /D_USRDLL /DLIBMBA_EXPORTS /DUSE_WCHAR /DMSGNO +-#lflags=/nologo /dll /incremental:no ++cflags=$(cflags) /ML /Isrc /DWIN32 /D_WINDOWS /DUNICODE /D_UNICODE /D_USRDLL /DLIBMBA_EXPORTS /DUSE_WCHAR /DMSGNO ++lflags=/nologo /dll /incremental:no OBJS=src\cfg.obj src\hashmap.obj src\hexdump.obj src\linkedlist.obj src\mbs.obj src\msgno.obj src\stack.obj src\pool.obj src\varray.obj src\wcwidth.obj src\csv.obj src\path.obj src\text.obj src\eval.obj src\allocator.obj src\suba.obj src\bitset.obj src\time.obj src\misc.obj |