From 1595a9a4f3295675f0afc1eb8eeb9c86e4e530fe Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 18 Dec 2012 08:12:15 +0000 Subject: [PATCH] touched up code for warp 4 --- qse/bld/os2-watcom/makefile | 111 ++++++----- qse/bld/qse.bkl | 50 ++++- qse/bld/win32-borland/makefile | 75 ++++---- qse/bld/win32-msvc/makefile | 125 ++++++------ qse/bld/win32-watcom/makefile | 100 +++++----- qse/cmd/awk/awk.c | 2 - qse/cmd/net/httpd.c | 2 - qse/configure | 34 ++-- qse/configure.ac | 10 +- qse/doc/page/awk-lang.md | 64 +++++-- qse/include/qse/cmn/mbwc.h | 9 +- qse/include/qse/conf-dos.h | 16 +- qse/include/qse/conf-msw.h | 18 +- qse/include/qse/conf-os2.h | 12 +- qse/include/qse/conf-vms.h | 2 +- qse/include/qse/config.h.in | 6 +- qse/lib/cmn/Makefile.am | 2 +- qse/lib/cmn/Makefile.in | 4 +- qse/lib/cmn/fio.c | 206 +++++++++++++------- qse/lib/cmn/mbwc.c | 4 +- qse/lib/cmn/mux.c | 337 +++++++++++++++++---------------- qse/lib/cmn/nwif-cfg.c | 7 +- qse/lib/cmn/nwio.c | 66 ++++--- qse/lib/cmn/pio.c | 1 + qse/lib/net/http.c | 2 +- qse/lib/net/httpd-std.c | 19 +- qse/lib/net/httpd.h | 2 +- 27 files changed, 772 insertions(+), 514 deletions(-) diff --git a/qse/bld/os2-watcom/makefile b/qse/bld/os2-watcom/makefile index cc72d88d..7534c7c6 100644 --- a/qse/bld/os2-watcom/makefile +++ b/qse/bld/os2-watcom/makefile @@ -40,6 +40,9 @@ XCMGRS = on # [on,off] BUNDLED_UNICODE = on +# [on,off] +TCPV40HDRS = off + # ------------------------------------------------------------------------- @@ -86,7 +89,7 @@ CPPFLAGS_BUILD = CPPFLAGS_BUILD = -DQSE_BUILD_DEBUG -DDEBUG -D_DEBUG !endif !ifeq BUILD release -CPPFLAGS_BUILD = -D_NDEBUG -UDEBUG -U_DEBUG +CPPFLAGS_BUILD = -DNDEBUG !endif CPPFLAGS_CHAR = !ifeq CHAR mchar @@ -97,10 +100,10 @@ CPPFLAGS_CHAR = -DQSE_CHAR_IS_WCHAR=1 !endif CPPFLAGS_XCMGRS = !ifeq XCMGRS off -CPPFLAGS_XCMGRS = -UQSE_INCLUDE_MORE_CMGRS +CPPFLAGS_XCMGRS = -UQSE_ENABLE_XCMGRS !endif !ifeq XCMGRS on -CPPFLAGS_XCMGRS = -DQSE_INCLUDE_MORE_CMGRS=1 +CPPFLAGS_XCMGRS = -DQSE_ENABLE_XCMGRS=1 !endif CPPFLAGS_BUNDLED_UNICODE = !ifeq BUNDLED_UNICODE off @@ -109,6 +112,13 @@ CPPFLAGS_BUNDLED_UNICODE = -UQSE_ENABLE_BUNDLED_UNICODE !ifeq BUNDLED_UNICODE on CPPFLAGS_BUNDLED_UNICODE = -DQSE_ENABLE_BUNDLED_UNICODE=1 !endif +CPPFLAGS_TCPV40HDRS = +!ifeq TCPV40HDRS off +CPPFLAGS_TCPV40HDRS = -UTCPV40HDRS +!endif +!ifeq TCPV40HDRS on +CPPFLAGS_TCPV40HDRS = -DTCPV40HDRS +!endif ____SOURCES_XCMGRS_FILENAMES_OBJECTS = !ifeq XCMGRS on ____SOURCES_XCMGRS_FILENAMES_OBJECTS = & @@ -120,6 +130,17 @@ ____SOURCES_BUNDLED_UNICODE_FILENAMES_OBJECTS = ____SOURCES_BUNDLED_UNICODE_FILENAMES_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn_uni.obj !endif +__SYSLIB_SOCKET_p = +!ifeq TCPV40HDRS off +__SYSLIB_SOCKET_p = tcpip32.lib +!endif +!ifeq TCPV40HDRS on +__SYSLIB_SOCKET_p = tcp32dll.lib +!endif +__SYSLIB_SOCKET2_p = +!ifeq TCPV40HDRS on +__SYSLIB_SOCKET2_p = so32dll.lib +!endif __DEBUG_INFO = !ifeq BUILD debug __DEBUG_INFO = -d2 @@ -138,8 +159,8 @@ __DEBUG_INFO_1_0 = ### Variables: ### DLLQSECMN_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) DLLQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn_alg_base64.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn_alg_rand.obj & @@ -229,8 +250,8 @@ DLLQSECMN_OBJECTS = & $(____SOURCES_XCMGRS_FILENAMES_OBJECTS) & $(____SOURCES_BUNDLED_UNICODE_FILENAMES_OBJECTS) DLLQSEAWK_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) DLLQSEAWK_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_awk.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_err.obj & @@ -244,30 +265,30 @@ DLLQSEAWK_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_rio.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_std.obj MODQSEAWKDIR_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) MODQSEAWKDIR_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj MODQSEAWKSTR_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) MODQSEAWKSTR_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj MODQSEAWKSYS_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) MODQSEAWKSYS_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj DLLQSESED_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) DLLQSESED_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_sed.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_err.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_std.obj DLLQSENET_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) DLLQSENET_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_http.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_htre.obj & @@ -283,35 +304,35 @@ DLLQSENET_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_httpd_text.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_upxd.obj EXEQSEAWK_CFLAGS = -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) EXEQSEAWK_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk_awk.obj EXEQSESED_CFLAGS = -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) EXEQSESED_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed_sed.obj EXEQSEHTTPD_CFLAGS = -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) EXEQSEHTTPD_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd_httpd.obj DLLQSECMNXX_CXXFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - -xs $(CPPFLAGS) $(CXXFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox -xs $(CPPFLAGS) $(CXXFLAGS) DLLQSECMNXX_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx_Mmgr.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx_StdMmgr.obj DLLQSEAWKXX_CXXFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - -xs $(CPPFLAGS) $(CXXFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox -xs $(CPPFLAGS) $(CXXFLAGS) DLLQSEAWKXX_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx_Awk.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx_StdAwk.obj DLLQSESEDXX_CXXFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - -xs $(CPPFLAGS) $(CXXFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox -xs $(CPPFLAGS) $(CXXFLAGS) DLLQSESEDXX_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx_Sed.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx_StdSed.obj @@ -362,13 +383,13 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll : $(DLLQSECMN_OBJECTS) @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc $(__DEBUG_INFO_1_0) $(LDFLAGS) @for %i in ($(DLLQSECMN_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc file %i - @for %i in () do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc library %i + @for %i in ( $(__SYSLIB_SOCKET_p) $(__SYSLIB_SOCKET2_p)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc library %i @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc system os2v2 dll wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll : $(DLLQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll : $(DLLQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk.lbc name $^@ @@ -381,7 +402,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll : $(DLLQSEAWK_OBJECTS) $(BUILDDIR wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-dir.dll : $(MODQSEAWKDIR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-dir.dll : $(MODQSEAWKDIR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir.lbc name $^@ @@ -394,7 +415,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-dir.dll : $(MODQSEAWKDIR_OBJECTS) $(BUIL wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-dir.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-str.dll : $(MODQSEAWKSTR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-str.dll : $(MODQSEAWKSTR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr.lbc name $^@ @@ -407,7 +428,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-str.dll : $(MODQSEAWKSTR_OBJECTS) $(BUIL wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-str.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-sys.dll : $(MODQSEAWKSYS_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-sys.dll : $(MODQSEAWKSYS_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys.lbc name $^@ @@ -420,7 +441,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-sys.dll : $(MODQSEAWKSYS_OBJECTS) $(BUIL wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\awk-sys.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll : $(DLLQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll : $(DLLQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed.lbc name $^@ @@ -433,32 +454,32 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll : $(DLLQSESED_OBJECTS) $(BUILDDIR wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll : $(DLLQSENET_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll : $(DLLQSENET_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc name $^@ @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc $(__DEBUG_INFO_1_0) $(LDFLAGS) @for %i in ($(DLLQSENET_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc file %i - @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc library %i + @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(__SYSLIB_SOCKET_p) $(__SYSLIB_SOCKET2_p)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc library %i @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc system os2v2 dll wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.exe : $(EXEQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.exe : $(EXEQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc name $^@ @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc $(__DEBUG_INFO_1_0) system os2v2 $(LDFLAGS) @for %i in ($(EXEQSEAWK_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc file %i - @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc library %i + @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib $(__SYSLIB_SOCKET_p) $(__SYSLIB_SOCKET2_p)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc library %i @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc @for %i in () do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc option stack=%i wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.exe : $(EXEQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.exe : $(EXEQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed.lbc name $^@ @@ -470,19 +491,19 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.exe : $(EXEQSESED_OBJECTS) $(BUILDDIR @for %i in () do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed.lbc option stack=%i wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed.lbc -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsehttpd.exe : $(EXEQSEHTTPD_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsehttpd.exe : $(EXEQSEHTTPD_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc name $^@ @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc $(__DEBUG_INFO_1_0) system os2v2 $(LDFLAGS) @for %i in ($(EXEQSEHTTPD_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc file %i - @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc library %i + @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib $(__SYSLIB_SOCKET_p) $(__SYSLIB_SOCKET2_p)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc library %i @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc @for %i in () do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc option stack=%i wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll : $(DLLQSECMNXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll : $(DLLQSECMNXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx.lbc name $^@ @@ -495,7 +516,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll : $(DLLQSECMNXX_OBJECTS) $(BUIL wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.dll : $(DLLQSEAWKXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.dll : $(DLLQSEAWKXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx.lbc name $^@ @@ -508,7 +529,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.dll : $(DLLQSEAWKXX_OBJECTS) $(BUIL wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.dll : $(DLLQSESEDXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.dll : $(DLLQSESEDXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx.lbc name $^@ diff --git a/qse/bld/qse.bkl b/qse/bld/qse.bkl index 86dbfbe3..68bd6454 100644 --- a/qse/bld/qse.bkl +++ b/qse/bld/qse.bkl @@ -21,6 +21,11 @@ on,off on + -DQSE_BUILD_DEBUG -DDEBUG -D_DEBUG - -D_NDEBUG -UDEBUG -U_DEBUG + -DNDEBUG -DQSE_CHAR_IS_WCHAR=1 -DQSE_CHAR_IS_MCHAR=1 - -DQSE_INCLUDE_MORE_CMGRS=1 - -UQSE_INCLUDE_MORE_CMGRS + -DQSE_ENABLE_XCMGRS=1 + -UQSE_ENABLE_XCMGRS -DQSE_ENABLE_BUNDLED_UNICODE=1 -UQSE_ENABLE_BUNDLED_UNICODE + + -DTCPV40HDRS + -UTCPV40HDRS + $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) + $(CPPFLAGS_TCPV40HDRS) + + ws2_32 + tcp32dll + tcpip32 + + + so32dll + + @@ -211,6 +233,8 @@ $(SOURCES_XCMGRS) $(SOURCES_BUNDLED_UNICODE) + $(SYSLIB_SOCKET) + $(SYSLIB_SOCKET2) @@ -231,6 +255,7 @@ std.c dllqsecmn + dllqsecmn @@ -240,6 +265,7 @@ dir.c dllqsecmn dllqseawk + dllqseawk @@ -249,6 +275,7 @@ str.c dllqsecmn dllqseawk + dllqseawk @@ -258,6 +285,7 @@ sys.c dllqsecmn dllqseawk + dllqseawk @@ -270,6 +298,7 @@ std.c dllqsecmn + dllqsecmn @@ -292,6 +321,9 @@ upxd.c dllqsecmn + dllqsecmn + $(SYSLIB_SOCKET) + $(SYSLIB_SOCKET2) @@ -301,6 +333,9 @@ awk.c dllqsecmn dllqseawk + dllqseawk + $(SYSLIB_SOCKET) + $(SYSLIB_SOCKET2) @@ -310,6 +345,7 @@ sed.c dllqsecmn dllqsesed + dllqsesed @@ -319,6 +355,9 @@ httpd.c dllqsecmn dllqsenet + dllqsenet + $(SYSLIB_SOCKET) + $(SYSLIB_SOCKET2) @@ -330,6 +369,7 @@ StdMmgr.cpp dllqsecmn + dllqsecmn @@ -343,6 +383,8 @@ dllqsecmn dllqsecmnxx dllqseawk + dllqsecmnxx + dllqseawk @@ -356,6 +398,8 @@ dllqsecmn dllqsecmnxx dllqsesed + dllqsecmnxx + dllqsesed diff --git a/qse/bld/win32-borland/makefile b/qse/bld/win32-borland/makefile index 1e7f8f96..40ee4b0e 100644 --- a/qse/bld/win32-borland/makefile +++ b/qse/bld/win32-borland/makefile @@ -69,6 +69,11 @@ XCMGRS = on BUNDLED_UNICODE = on !endif +# [on,off] +!ifndef TCPV40HDRS +TCPV40HDRS = off +!endif + # ------------------------------------------------------------------------- @@ -79,7 +84,7 @@ BUNDLED_UNICODE = on DLLQSECMN_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) DLLQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn_alg_base64.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn_alg_rand.obj \ @@ -170,7 +175,7 @@ DLLQSECMN_OBJECTS = \ $(____SOURCES_BUNDLED_UNICODE_FILENAMES_OBJECTS) DLLQSEAWK_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) DLLQSEAWK_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_awk.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_err.obj \ @@ -185,29 +190,29 @@ DLLQSEAWK_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_std.obj MODQSEAWKDIR_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) MODQSEAWKDIR_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj MODQSEAWKSTR_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) MODQSEAWKSTR_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj MODQSEAWKSYS_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) MODQSEAWKSYS_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj DLLQSESED_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) DLLQSESED_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_sed.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_err.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_std.obj DLLQSENET_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) DLLQSENET_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_http.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_htre.obj \ @@ -224,34 +229,34 @@ DLLQSENET_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_upxd.obj EXEQSEAWK_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) EXEQSEAWK_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk_awk.obj EXEQSESED_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) EXEQSESED_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed_sed.obj EXEQSEHTTPD_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CFLAGS) EXEQSEHTTPD_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd_httpd.obj DLLQSECMNXX_CXXFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CXXFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CXXFLAGS) DLLQSECMNXX_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx_Mmgr.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx_StdMmgr.obj DLLQSEAWKXX_CXXFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CXXFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CXXFLAGS) DLLQSEAWKXX_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx_Awk.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx_StdAwk.obj DLLQSESEDXX_CXXFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) \ - $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CXXFLAGS) + $(CPPFLAGS_TCPV40HDRS) $(__DEBUG_INFO) -tWM -O2 $(CPPFLAGS) $(CXXFLAGS) DLLQSESEDXX_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx_Sed.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx_StdSed.obj @@ -274,7 +279,7 @@ BUILDDIR_CHAR = wchar CPPFLAGS_BUILD = -DQSE_BUILD_DEBUG -DDEBUG -D_DEBUG !endif !if "$(BUILD)" == "release" -CPPFLAGS_BUILD = -D_NDEBUG -UDEBUG -U_DEBUG +CPPFLAGS_BUILD = -DNDEBUG !endif !if "$(CHAR)" == "mchar" CPPFLAGS_CHAR = -DQSE_CHAR_IS_MCHAR=1 @@ -283,10 +288,10 @@ CPPFLAGS_CHAR = -DQSE_CHAR_IS_MCHAR=1 CPPFLAGS_CHAR = -DQSE_CHAR_IS_WCHAR=1 !endif !if "$(XCMGRS)" == "off" -CPPFLAGS_XCMGRS = -UQSE_INCLUDE_MORE_CMGRS +CPPFLAGS_XCMGRS = -UQSE_ENABLE_XCMGRS !endif !if "$(XCMGRS)" == "on" -CPPFLAGS_XCMGRS = -DQSE_INCLUDE_MORE_CMGRS=1 +CPPFLAGS_XCMGRS = -DQSE_ENABLE_XCMGRS=1 !endif !if "$(BUNDLED_UNICODE)" == "off" CPPFLAGS_BUNDLED_UNICODE = -UQSE_ENABLE_BUNDLED_UNICODE @@ -294,6 +299,12 @@ CPPFLAGS_BUNDLED_UNICODE = -UQSE_ENABLE_BUNDLED_UNICODE !if "$(BUNDLED_UNICODE)" == "on" CPPFLAGS_BUNDLED_UNICODE = -DQSE_ENABLE_BUNDLED_UNICODE=1 !endif +!if "$(TCPV40HDRS)" == "off" +CPPFLAGS_TCPV40HDRS = -UTCPV40HDRS +!endif +!if "$(TCPV40HDRS)" == "on" +CPPFLAGS_TCPV40HDRS = -DTCPV40HDRS +!endif !if "$(XCMGRS)" == "on" ____SOURCES_XCMGRS_FILENAMES_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn_cp949.obj \ @@ -414,74 +425,74 @@ clean: $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll: $(DLLQSECMN_OBJECTS) ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) $(LDFLAGS) @&&| - c0d32.obj $(DLLQSECMN_OBJECTS),$@,, import32.lib cw32mt.lib,, + c0d32.obj $(DLLQSECMN_OBJECTS),$@,, ws2_32.lib import32.lib cw32mt.lib,, | implib -f $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn $@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll: $(DLLQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll: $(DLLQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) $(LDFLAGS) @&&| c0d32.obj $(DLLQSEAWK_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib import32.lib cw32mt.lib,, | implib -f $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk $@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.dll: $(MODQSEAWKDIR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.dll: $(MODQSEAWKDIR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) $(LDFLAGS) @&&| c0d32.obj $(MODQSEAWKDIR_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib import32.lib cw32mt.lib,, | implib -f $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir $@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.dll: $(MODQSEAWKSTR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.dll: $(MODQSEAWKSTR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) $(LDFLAGS) @&&| c0d32.obj $(MODQSEAWKSTR_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib import32.lib cw32mt.lib,, | implib -f $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str $@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.dll: $(MODQSEAWKSYS_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.dll: $(MODQSEAWKSYS_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) $(LDFLAGS) @&&| c0d32.obj $(MODQSEAWKSYS_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib import32.lib cw32mt.lib,, | implib -f $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys $@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll: $(DLLQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll: $(DLLQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) $(LDFLAGS) @&&| c0d32.obj $(DLLQSESED_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib import32.lib cw32mt.lib,, | implib -f $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed $@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll: $(DLLQSENET_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll: $(DLLQSENET_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) $(LDFLAGS) @&&| - c0d32.obj $(DLLQSENET_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib import32.lib cw32mt.lib,, + c0d32.obj $(DLLQSENET_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib ws2_32.lib import32.lib cw32mt.lib,, | implib -f $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet $@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.exe: $(EXEQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.exe: $(EXEQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) -ap $(LDFLAGS) @&&| - c0x32.obj $(EXEQSEAWK_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib import32.lib cw32mt.lib,, + c0x32.obj $(EXEQSEAWK_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib ws2_32.lib import32.lib cw32mt.lib,, | -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.exe: $(EXEQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.exe: $(EXEQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) -ap $(LDFLAGS) @&&| c0x32.obj $(EXEQSESED_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.lib import32.lib cw32mt.lib,, | -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsehttpd.exe: $(EXEQSEHTTPD_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsehttpd.exe: $(EXEQSEHTTPD_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) -ap $(LDFLAGS) @&&| - c0x32.obj $(EXEQSEHTTPD_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib import32.lib cw32mt.lib,, + c0x32.obj $(EXEQSEHTTPD_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib ws2_32.lib import32.lib cw32mt.lib,, | -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll: $(DLLQSECMNXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll: $(DLLQSECMNXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) $(LDFLAGS) @&&| c0d32.obj $(DLLQSECMNXX_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib import32.lib cw32mt.lib,, | implib -f $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx $@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.dll: $(DLLQSEAWKXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.dll: $(DLLQSEAWKXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) $(LDFLAGS) @&&| c0d32.obj $(DLLQSEAWKXX_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib import32.lib cw32mt.lib,, | implib -f $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx $@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.dll: $(DLLQSESEDXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.dll: $(DLLQSESEDXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) $(LDFLAGS) @&&| c0d32.obj $(DLLQSESEDXX_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.lib import32.lib cw32mt.lib,, | diff --git a/qse/bld/win32-msvc/makefile b/qse/bld/win32-msvc/makefile index 24f01376..ae4f5876 100644 --- a/qse/bld/win32-msvc/makefile +++ b/qse/bld/win32-msvc/makefile @@ -17,10 +17,10 @@ CC = cl CXX = cl # Standard flags for CC -CFLAGS = /GS- +CFLAGS = # Standard flags for C++ -CXXFLAGS = /GS- +CXXFLAGS = # Standard preprocessor flags (common for CC and CXX) CPPFLAGS = @@ -40,6 +40,9 @@ XCMGRS = on # [on,off] BUNDLED_UNICODE = on +# [on,off] +TCPV40HDRS = off + # ------------------------------------------------------------------------- @@ -50,8 +53,9 @@ BUNDLED_UNICODE = on DLLQSECMN_CFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.pdb /O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.pdb /O2 \ + $(CPPFLAGS) $(CFLAGS) DLLQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn_alg_base64.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn_alg_rand.obj \ @@ -142,8 +146,9 @@ DLLQSECMN_OBJECTS = \ $(____SOURCES_BUNDLED_UNICODE_FILENAMES_OBJECTS) DLLQSEAWK_CFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.pdb /O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.pdb /O2 \ + $(CPPFLAGS) $(CFLAGS) DLLQSEAWK_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_awk.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_err.obj \ @@ -158,37 +163,39 @@ DLLQSEAWK_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_std.obj MODQSEAWKDIR_CFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.pdb /O2 $(CPPFLAGS) \ - $(CFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.pdb /O2 \ + $(CPPFLAGS) $(CFLAGS) MODQSEAWKDIR_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj MODQSEAWKSTR_CFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.pdb /O2 $(CPPFLAGS) \ - $(CFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.pdb /O2 \ + $(CPPFLAGS) $(CFLAGS) MODQSEAWKSTR_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj MODQSEAWKSYS_CFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.pdb /O2 $(CPPFLAGS) \ - $(CFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.pdb /O2 \ + $(CPPFLAGS) $(CFLAGS) MODQSEAWKSYS_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj DLLQSESED_CFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.pdb /O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.pdb /O2 \ + $(CPPFLAGS) $(CFLAGS) DLLQSESED_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_sed.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_err.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_std.obj DLLQSENET_CFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.pdb /O2 $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.pdb /O2 \ + $(CPPFLAGS) $(CFLAGS) DLLQSENET_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_http.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_htre.obj \ @@ -205,46 +212,46 @@ DLLQSENET_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_upxd.obj EXEQSEAWK_CFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.pdb /O2 /D_CONSOLE $(CPPFLAGS) \ - $(CFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.pdb /O2 \ + /D_CONSOLE $(CPPFLAGS) $(CFLAGS) EXEQSEAWK_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk_awk.obj EXEQSESED_CFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.pdb /O2 /D_CONSOLE $(CPPFLAGS) \ - $(CFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.pdb /O2 \ + /D_CONSOLE $(CPPFLAGS) $(CFLAGS) EXEQSESED_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed_sed.obj EXEQSEHTTPD_CFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsehttpd.pdb /O2 /D_CONSOLE \ - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsehttpd.pdb /O2 \ + /D_CONSOLE $(CPPFLAGS) $(CFLAGS) EXEQSEHTTPD_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd_httpd.obj DLLQSECMNXX_CXXFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.pdb /O2 /GR /EHsc $(CPPFLAGS) \ - $(CXXFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.pdb /O2 \ + /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) DLLQSECMNXX_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx_Mmgr.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx_StdMmgr.obj DLLQSEAWKXX_CXXFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.pdb /O2 /GR /EHsc $(CPPFLAGS) \ - $(CXXFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.pdb /O2 \ + /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) DLLQSEAWKXX_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx_Awk.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx_StdAwk.obj DLLQSESEDXX_CXXFLAGS = /MD$(__DEBUG_INFO_54) /DWIN32 /I..\..\include \ $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) $(CPPFLAGS_XCMGRS) \ - $(CPPFLAGS_BUNDLED_UNICODE) /W4 $(__DEBUG_INFO) $(____DEBUG_INFO) \ - /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.pdb /O2 /GR /EHsc $(CPPFLAGS) \ - $(CXXFLAGS) + $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) /W4 $(__DEBUG_INFO) \ + $(____DEBUG_INFO) /Fd$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.pdb /O2 \ + /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) DLLQSESEDXX_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx_Sed.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx_StdSed.obj @@ -267,7 +274,7 @@ BUILDDIR_CHAR = wchar CPPFLAGS_BUILD = -DQSE_BUILD_DEBUG -DDEBUG -D_DEBUG !endif !if "$(BUILD)" == "release" -CPPFLAGS_BUILD = -D_NDEBUG -UDEBUG -U_DEBUG +CPPFLAGS_BUILD = -DNDEBUG !endif !if "$(CHAR)" == "mchar" CPPFLAGS_CHAR = -DQSE_CHAR_IS_MCHAR=1 @@ -276,10 +283,10 @@ CPPFLAGS_CHAR = -DQSE_CHAR_IS_MCHAR=1 CPPFLAGS_CHAR = -DQSE_CHAR_IS_WCHAR=1 !endif !if "$(XCMGRS)" == "off" -CPPFLAGS_XCMGRS = -UQSE_INCLUDE_MORE_CMGRS +CPPFLAGS_XCMGRS = -UQSE_ENABLE_XCMGRS !endif !if "$(XCMGRS)" == "on" -CPPFLAGS_XCMGRS = -DQSE_INCLUDE_MORE_CMGRS=1 +CPPFLAGS_XCMGRS = -DQSE_ENABLE_XCMGRS=1 !endif !if "$(BUNDLED_UNICODE)" == "off" CPPFLAGS_BUNDLED_UNICODE = -UQSE_ENABLE_BUNDLED_UNICODE @@ -287,6 +294,12 @@ CPPFLAGS_BUNDLED_UNICODE = -UQSE_ENABLE_BUNDLED_UNICODE !if "$(BUNDLED_UNICODE)" == "on" CPPFLAGS_BUNDLED_UNICODE = -DQSE_ENABLE_BUNDLED_UNICODE=1 !endif +!if "$(TCPV40HDRS)" == "off" +CPPFLAGS_TCPV40HDRS = -UTCPV40HDRS +!endif +!if "$(TCPV40HDRS)" == "on" +CPPFLAGS_TCPV40HDRS = -DTCPV40HDRS +!endif !if "$(BUILD)" == "debug" __DEBUG_INFO_9 = $(__DEBUG_INFO_55) !endif @@ -470,65 +483,65 @@ clean: $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll: $(DLLQSECMN_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.pdb" $(__DEBUG_INFO_9) $(LDFLAGS) @<< - $(DLLQSECMN_OBJECTS) /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib + $(DLLQSECMN_OBJECTS) ws2_32.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll: $(DLLQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll: $(DLLQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll link /DLL /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.pdb" $(__DEBUG_INFO_23) $(LDFLAGS) @<< $(DLLQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.dll: $(MODQSEAWKDIR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.dll: $(MODQSEAWKDIR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll link /DLL /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.pdb" $(__DEBUG_INFO_37) $(LDFLAGS) @<< $(MODQSEAWKDIR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.dll: $(MODQSEAWKSTR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.dll: $(MODQSEAWKSTR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll link /DLL /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.pdb" $(__DEBUG_INFO_51) $(LDFLAGS) @<< $(MODQSEAWKSTR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.dll: $(MODQSEAWKSYS_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.dll: $(MODQSEAWKSYS_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll link /DLL /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.pdb" $(__DEBUG_INFO_65) $(LDFLAGS) @<< $(MODQSEAWKSYS_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll: $(DLLQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll: $(DLLQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll link /DLL /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.pdb" $(__DEBUG_INFO_79) $(LDFLAGS) @<< $(DLLQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll: $(DLLQSENET_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll: $(DLLQSENET_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll link /DLL /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.pdb" $(__DEBUG_INFO_93) $(LDFLAGS) @<< - $(DLLQSENET_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib + $(DLLQSENET_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib ws2_32.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.exe: $(EXEQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.exe: $(EXEQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll link /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.pdb" $(__DEBUG_INFO_106) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< - $(EXEQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib + $(EXEQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib ws2_32.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.exe: $(EXEQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.exe: $(EXEQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll link /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.pdb" $(__DEBUG_INFO_121) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(EXEQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsehttpd.exe: $(EXEQSEHTTPD_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsehttpd.exe: $(EXEQSEHTTPD_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll link /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsehttpd.pdb" $(__DEBUG_INFO_136) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< - $(EXEQSEHTTPD_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib + $(EXEQSEHTTPD_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib ws2_32.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll: $(DLLQSECMNXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll: $(DLLQSECMNXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll link /DLL /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.pdb" $(__DEBUG_INFO_151) $(LDFLAGS) @<< $(DLLQSECMNXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.dll: $(DLLQSEAWKXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.dll: $(DLLQSEAWKXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll link /DLL /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.pdb" $(__DEBUG_INFO_165) $(LDFLAGS) @<< $(DLLQSEAWKXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.lib << -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.dll: $(DLLQSESEDXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.dll: $(DLLQSESEDXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll link /DLL /NOLOGO /OUT:$@ $(__DEBUG_INFO_53) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.pdb" $(__DEBUG_INFO_179) $(LDFLAGS) @<< $(DLLQSESEDXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.lib << diff --git a/qse/bld/win32-watcom/makefile b/qse/bld/win32-watcom/makefile index f58e10b2..5b3ab4ce 100644 --- a/qse/bld/win32-watcom/makefile +++ b/qse/bld/win32-watcom/makefile @@ -40,6 +40,9 @@ XCMGRS = on # [on,off] BUNDLED_UNICODE = on +# [on,off] +TCPV40HDRS = off + # ------------------------------------------------------------------------- @@ -86,7 +89,7 @@ CPPFLAGS_BUILD = CPPFLAGS_BUILD = -DQSE_BUILD_DEBUG -DDEBUG -D_DEBUG !endif !ifeq BUILD release -CPPFLAGS_BUILD = -D_NDEBUG -UDEBUG -U_DEBUG +CPPFLAGS_BUILD = -DNDEBUG !endif CPPFLAGS_CHAR = !ifeq CHAR mchar @@ -97,10 +100,10 @@ CPPFLAGS_CHAR = -DQSE_CHAR_IS_WCHAR=1 !endif CPPFLAGS_XCMGRS = !ifeq XCMGRS off -CPPFLAGS_XCMGRS = -UQSE_INCLUDE_MORE_CMGRS +CPPFLAGS_XCMGRS = -UQSE_ENABLE_XCMGRS !endif !ifeq XCMGRS on -CPPFLAGS_XCMGRS = -DQSE_INCLUDE_MORE_CMGRS=1 +CPPFLAGS_XCMGRS = -DQSE_ENABLE_XCMGRS=1 !endif CPPFLAGS_BUNDLED_UNICODE = !ifeq BUNDLED_UNICODE off @@ -109,6 +112,13 @@ CPPFLAGS_BUNDLED_UNICODE = -UQSE_ENABLE_BUNDLED_UNICODE !ifeq BUNDLED_UNICODE on CPPFLAGS_BUNDLED_UNICODE = -DQSE_ENABLE_BUNDLED_UNICODE=1 !endif +CPPFLAGS_TCPV40HDRS = +!ifeq TCPV40HDRS off +CPPFLAGS_TCPV40HDRS = -UTCPV40HDRS +!endif +!ifeq TCPV40HDRS on +CPPFLAGS_TCPV40HDRS = -DTCPV40HDRS +!endif ____SOURCES_XCMGRS_FILENAMES_OBJECTS = !ifeq XCMGRS on ____SOURCES_XCMGRS_FILENAMES_OBJECTS = & @@ -138,8 +148,8 @@ __DEBUG_INFO_1_0 = ### Variables: ### DLLQSECMN_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) DLLQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn_alg_base64.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn_alg_rand.obj & @@ -229,8 +239,8 @@ DLLQSECMN_OBJECTS = & $(____SOURCES_XCMGRS_FILENAMES_OBJECTS) & $(____SOURCES_BUNDLED_UNICODE_FILENAMES_OBJECTS) DLLQSEAWK_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) DLLQSEAWK_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_awk.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_err.obj & @@ -244,30 +254,30 @@ DLLQSEAWK_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_rio.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_std.obj MODQSEAWKDIR_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) MODQSEAWKDIR_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj MODQSEAWKSTR_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) MODQSEAWKSTR_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj MODQSEAWKSYS_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) MODQSEAWKSYS_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj DLLQSESED_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) DLLQSESED_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_sed.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_err.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_std.obj DLLQSENET_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) DLLQSENET_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_http.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_htre.obj & @@ -283,35 +293,35 @@ DLLQSENET_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_httpd_text.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet_upxd.obj EXEQSEAWK_CFLAGS = -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) EXEQSEAWK_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk_awk.obj EXEQSESED_CFLAGS = -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) EXEQSESED_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed_sed.obj EXEQSEHTTPD_CFLAGS = -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - $(CPPFLAGS) $(CFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) EXEQSEHTTPD_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd_httpd.obj DLLQSECMNXX_CXXFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - -xs $(CPPFLAGS) $(CXXFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox -xs $(CPPFLAGS) $(CXXFLAGS) DLLQSECMNXX_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx_Mmgr.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx_StdMmgr.obj DLLQSEAWKXX_CXXFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - -xs $(CPPFLAGS) $(CXXFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox -xs $(CPPFLAGS) $(CXXFLAGS) DLLQSEAWKXX_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx_Awk.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx_StdAwk.obj DLLQSESEDXX_CXXFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & - $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) -wx $(__DEBUG_INFO) -bm -ot -ox & - -xs $(CPPFLAGS) $(CXXFLAGS) + $(CPPFLAGS_XCMGRS) $(CPPFLAGS_BUNDLED_UNICODE) $(CPPFLAGS_TCPV40HDRS) -wx & + $(__DEBUG_INFO) -bm -ot -ox -xs $(CPPFLAGS) $(CXXFLAGS) DLLQSESEDXX_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx_Sed.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx_StdSed.obj @@ -362,13 +372,13 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll : $(DLLQSECMN_OBJECTS) @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc $(__DEBUG_INFO_1_0) $(LDFLAGS) @for %i in ($(DLLQSECMN_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc file %i - @for %i in () do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc library %i + @for %i in ( ws2_32.lib ) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc library %i @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc system nt_dll wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmn.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll : $(DLLQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll : $(DLLQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk.lbc name $^@ @@ -381,7 +391,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll : $(DLLQSEAWK_OBJECTS) $(BUILDDIR wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.dll : $(MODQSEAWKDIR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.dll : $(MODQSEAWKDIR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir.lbc name $^@ @@ -394,7 +404,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.dll : $(MODQSEAWKDIR_OBJECTS) $(B wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-dir.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.dll : $(MODQSEAWKSTR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.dll : $(MODQSEAWKSTR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr.lbc name $^@ @@ -407,7 +417,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.dll : $(MODQSEAWKSTR_OBJECTS) $(B wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-str.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.dll : $(MODQSEAWKSYS_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.dll : $(MODQSEAWKSYS_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys.lbc name $^@ @@ -420,7 +430,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.dll : $(MODQSEAWKSYS_OBJECTS) $(B wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk-sys.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll : $(DLLQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll : $(DLLQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed.lbc name $^@ @@ -433,32 +443,32 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll : $(DLLQSESED_OBJECTS) $(BUILDDIR wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll : $(DLLQSENET_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll : $(DLLQSENET_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc name $^@ @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc $(__DEBUG_INFO_1_0) $(LDFLAGS) @for %i in ($(DLLQSENET_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc file %i - @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc library %i + @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib ws2_32.lib ) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc library %i @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc system nt_dll wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsenet.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.exe : $(EXEQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.exe : $(EXEQSEAWK_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc name $^@ @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc $(__DEBUG_INFO_1_0) system nt ref 'main_' $(LDFLAGS) @for %i in ($(EXEQSEAWK_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc file %i - @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc library %i + @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.lib ws2_32.lib ) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc library %i @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc @for %i in () do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc option stack=%i wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqseawk.lbc -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.exe : $(EXEQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.exe : $(EXEQSESED_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed.lbc name $^@ @@ -470,19 +480,19 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.exe : $(EXEQSESED_OBJECTS) $(BUILDDIR @for %i in () do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed.lbc option stack=%i wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsesed.lbc -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsehttpd.exe : $(EXEQSEHTTPD_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsehttpd.exe : $(EXEQSEHTTPD_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc name $^@ @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc $(__DEBUG_INFO_1_0) system nt ref 'main_' $(LDFLAGS) @for %i in ($(EXEQSEHTTPD_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc file %i - @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc library %i + @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsenet.lib ws2_32.lib ) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc library %i @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc @for %i in () do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc option stack=%i wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\exeqsehttpd.lbc -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll : $(DLLQSECMNXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll : $(DLLQSECMNXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx.lbc name $^@ @@ -495,7 +505,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll : $(DLLQSECMNXX_OBJECTS) $(BUIL wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsecmnxx.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.dll : $(DLLQSEAWKXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.dll : $(DLLQSEAWKXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawk.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx.lbc name $^@ @@ -508,7 +518,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.dll : $(DLLQSEAWKXX_OBJECTS) $(BUIL wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawkxx.lbc wlib -q -n -b $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qseawkxx.lib +$^@ -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.dll : $(DLLQSESEDXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesedxx.dll : $(DLLQSESEDXX_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmn.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsecmnxx.dll $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\qsesed.dll @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesedxx.lbc name $^@ diff --git a/qse/cmd/awk/awk.c b/qse/cmd/awk/awk.c index d9d6c84a..1d5395df 100644 --- a/qse/cmd/awk/awk.c +++ b/qse/cmd/awk/awk.c @@ -45,8 +45,6 @@ # include # include # include -# pragma library("ws2_32.lib") -# pragma comment(lib,"ws2_32.lib") #elif defined(__OS2__) # define INCL_DOSPROCESS # define INCL_DOSEXCEPTIONS diff --git a/qse/cmd/net/httpd.c b/qse/cmd/net/httpd.c index 2168b55f..7acc1102 100644 --- a/qse/cmd/net/httpd.c +++ b/qse/cmd/net/httpd.c @@ -15,8 +15,6 @@ # include # include # include -# pragma library("ws2_32.lib") -# pragma comment(lib,"ws2_32.lib") #elif defined(__OS2__) # define INCL_DOSPROCESS # define INCL_DOSEXCEPTIONS diff --git a/qse/configure b/qse/configure index 40012863..78a85542 100755 --- a/qse/configure +++ b/qse/configure @@ -641,8 +641,8 @@ ax_pthread_config ENABLE_CXX_FALSE ENABLE_CXX_TRUE BUILD_MODE -INCLUDE_MORE_CMGRS_FALSE -INCLUDE_MORE_CMGRS_TRUE +ENABLE_XCMGRS_FALSE +ENABLE_XCMGRS_TRUE ENABLE_BUNDLED_UNICODE_FALSE ENABLE_BUNDLED_UNICODE_TRUE WCHAR_FALSE @@ -823,7 +823,7 @@ with_ltdl_lib enable_ltdl_install enable_wchar enable_bundled_unicode -enable_more_cmgrs +enable_xcmgrs enable_syscall enable_debug enable_cxx @@ -1475,7 +1475,7 @@ Optional Features: (default. yes) --enable-bundled-unicode use thn bundled unicode routines (default. no) - --enable-more-cmgrs include more built-in cmgrs like cp949 and cp950 + --enable-xcmgrs include more built-in cmgrs like cp949 and cp950 when enabled (default. yes) --enable-syscall use the syscall() function to call system calls (default. no) @@ -20173,25 +20173,25 @@ else fi -# Check whether --enable-more-cmgrs was given. -if test "${enable_more_cmgrs+set}" = set; then : - enableval=$enable_more_cmgrs; enable_more_cmgrs_is=$enableval +# Check whether --enable-xcmgrs was given. +if test "${enable_xcmgrs+set}" = set; then : + enableval=$enable_xcmgrs; enable_xcmgrs_is=$enableval else - enable_more_cmgrs_is=yes + enable_xcmgrs_is=yes fi -if test "${enable_more_cmgrs_is}" = "yes" +if test "${enable_xcmgrs_is}" = "yes" then -$as_echo "#define QSE_INCLUDE_MORE_CMGRS /**/" >>confdefs.h +$as_echo "#define QSE_ENABLE_XCMGRS /**/" >>confdefs.h fi - if test "${enable_more_cmgrs_is}" = "yes" ; then - INCLUDE_MORE_CMGRS_TRUE= - INCLUDE_MORE_CMGRS_FALSE='#' + if test "${enable_xcmgrs_is}" = "yes" ; then + ENABLE_XCMGRS_TRUE= + ENABLE_XCMGRS_FALSE='#' else - INCLUDE_MORE_CMGRS_TRUE='#' - INCLUDE_MORE_CMGRS_FALSE= + ENABLE_XCMGRS_TRUE='#' + ENABLE_XCMGRS_FALSE= fi @@ -20900,8 +20900,8 @@ if test -z "${ENABLE_BUNDLED_UNICODE_TRUE}" && test -z "${ENABLE_BUNDLED_UNICODE as_fn_error $? "conditional \"ENABLE_BUNDLED_UNICODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${INCLUDE_MORE_CMGRS_TRUE}" && test -z "${INCLUDE_MORE_CMGRS_FALSE}"; then - as_fn_error $? "conditional \"INCLUDE_MORE_CMGRS\" was never defined. +if test -z "${ENABLE_XCMGRS_TRUE}" && test -z "${ENABLE_XCMGRS_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_XCMGRS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_CXX_TRUE}" && test -z "${ENABLE_CXX_FALSE}"; then diff --git a/qse/configure.ac b/qse/configure.ac index 6e3d9802..c45e7a7e 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -409,13 +409,13 @@ then fi AM_CONDITIONAL(ENABLE_BUNDLED_UNICODE, test "${enable_bundled_unicode_is}" = "yes") -AC_ARG_ENABLE([more-cmgrs], [AS_HELP_STRING([--enable-more-cmgrs],[include more built-in cmgrs like cp949 and cp950 when enabled (default. yes)])], - enable_more_cmgrs_is=$enableval,enable_more_cmgrs_is=yes) -if test "${enable_more_cmgrs_is}" = "yes" +AC_ARG_ENABLE([xcmgrs], [AS_HELP_STRING([--enable-xcmgrs],[include more built-in cmgrs like cp949 and cp950 when enabled (default. yes)])], + enable_xcmgrs_is=$enableval,enable_xcmgrs_is=yes) +if test "${enable_xcmgrs_is}" = "yes" then - AC_DEFINE([QSE_INCLUDE_MORE_CMGRS],[],[include more built-in cmgrs like cp949 and cp950]) + AC_DEFINE([QSE_ENABLE_XCMGRS],[],[include more built-in cmgrs like cp949 and cp950]) fi -AM_CONDITIONAL(INCLUDE_MORE_CMGRS, test "${enable_more_cmgrs_is}" = "yes" ) +AM_CONDITIONAL(ENABLE_XCMGRS, test "${enable_xcmgrs_is}" = "yes" ) AC_ARG_ENABLE([syscall], [AS_HELP_STRING([--enable-syscall],[use the syscall() function to call system calls (default. no)])], enable_syscall_is=$enableval,enable_syscall_is=no) diff --git a/qse/doc/page/awk-lang.md b/qse/doc/page/awk-lang.md index b6571256..9d2b54af 100644 --- a/qse/doc/page/awk-lang.md +++ b/qse/doc/page/awk-lang.md @@ -12,7 +12,7 @@ tranforms them to an internal form for execution. A single-line comment is introduced by a hash character #, and is terminated at the end of the same line. Additionally, it supports a C-style multi-line comment -enclosed in /* and */. The multi-line comment can't nest and can't appear within +enclosed in /* and */. The multi-line comment can't nest and can't appear within string literals and regular expressions. x = y; # assign y to x. @@ -63,6 +63,19 @@ represents the value of 0. A string is enclosed in a pair of double quotes or single quotes. +A character in a string encosed in the double-quotes can be preceeded with +a back-slash to change the meaning of the character. + +\\ +\a +\b +\uXXXX +\UXXXXXXXX + +There are no escaping sequences supported for a string enclosed in the single +quotes. For that reason, you can't specify the single quote itself within +a single-quoted string. + ### Regular Expressions ### A regular expression is enclosed in a pair of forward slashes. @@ -620,16 +633,15 @@ C:\> chcp Active code page: 949 C:\> type s.awk BEGIN { - sock = "tcpd://0.0.0.0:9999"; - setioattr (sock, "codepage", "cp949"); # this is not needed since the active - # code page is already 949. - do { - - if ((sock || getline x) <= 0) break; - print "PEER: " x; - print x || sock; - } - while(1); + sock = "tcpd://0.0.0.0:9999"; + setioattr (sock, "codepage", "cp949"); # this is not needed since the active + # code page is already 949. + do { + if ((sock || getline x) <= 0) break; + print "PEER: " x; + print x || sock; + } + while(1); } C:\> qseawk --rwpipe=on -f r.awk PEER: 안녕 @@ -666,6 +678,36 @@ Note that 你 has been converted to a question mark since the letter is not supported by cp949. +## Built-in Functions ## +QSEAWK provides the following built-in functions. + +### setioattr (io-name, attr-name, attr-value) ### + +It changes the I/O attribute of the name attr-name to the value attr-value +for an I/O stream identified by io-name. It returns 0 on success and -1 on +failure. + +- io-name is a source or target name used in getline, print, printf combined + with |, ||, >, <, >>. +- attr-name is one of codepage, ctimeout, atimeout, rtimeout, wtimeout. +- attr-value varies depending on attr-name. +-- codepage: cp949, cp950, utf8 +-- ctimeout, atimeout, rtimeout, wtimeout: the number of seconds. applies to socket based stream only. you may use a floating-point number for lower resoluation than a second. a negative value turns off timeout. + +# +# Convert a document encoded in cp949 to a current codepage +# +BEGIN +{ + setioattr ("README.INS", "codepage", "cp949"); + while ((getline x < "README.INS") > 0) print x; +} + +### getioattr (io-name, attr-name) ### + +It returns the current attribute value of the attribute named attr-name for +the stream identified by io-name. See setioattr for description on io-name and +attr-name. It returns the attribute value on success and -1 on failure. [awkbook]: http://cm.bell-labs.com/cm/cs/awkbook/ diff --git a/qse/include/qse/cmn/mbwc.h b/qse/include/qse/cmn/mbwc.h index d917c23c..29316f16 100644 --- a/qse/include/qse/cmn/mbwc.h +++ b/qse/include/qse/cmn/mbwc.h @@ -36,11 +36,12 @@ typedef qse_cmgr_t* (*qse_cmgr_finder_t) (const qse_char_t* name); enum qse_cmgr_id_t { QSE_CMGR_SLMB, -#if defined(QSE_INCLUDE_MORE_CMGRS) - QSE_CMGR_CP949, - QSE_CMGR_CP950, -#endif QSE_CMGR_UTF8 +#if defined(QSE_ENABLE_XCMGRS) + , + QSE_CMGR_CP949, + QSE_CMGR_CP950 +#endif }; typedef enum qse_cmgr_id_t qse_cmgr_id_t; diff --git a/qse/include/qse/conf-dos.h b/qse/include/qse/conf-dos.h index 8b892973..77d12dd7 100644 --- a/qse/include/qse/conf-dos.h +++ b/qse/include/qse/conf-dos.h @@ -62,7 +62,12 @@ # if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR) # define QSE_CHAR_IS_WCHAR 1 # endif -# undef QSE_ENABLE_BUNDLED_UNICODE + + /* old watcom c/c++ compiler requires this */ +# if (__WATCOMC__ < 1200) +# undef QSE_ENABLE_BUNDLED_UNICODE +# define QSE_ENABLE_BUNDLED_UNICODE 1 +# endif #elif defined(__WATCOMC__) && !defined(__386__) # define QSE_SIZEOF_CHAR 1 @@ -96,10 +101,15 @@ # if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR) # define QSE_CHAR_IS_WCHAR 1 # endif -# undef QSE_ENABLE_BUNDLED_UNICODE + + /* old watcom c/c++ compiler requires this */ +# if (__WATCOMC__ < 1200) +# undef QSE_ENABLE_BUNDLED_UNICODE +# define QSE_ENABLE_BUNDLED_UNICODE 1 +# endif #else # error Define the size of various data types. #endif -#include "conf-inf.h" +#include diff --git a/qse/include/qse/conf-msw.h b/qse/include/qse/conf-msw.h index 9b428033..9277bf55 100644 --- a/qse/include/qse/conf-msw.h +++ b/qse/include/qse/conf-msw.h @@ -49,7 +49,11 @@ _M_X64 x64 platform # define QSE_SIZEOF_SHORT 2 # define QSE_SIZEOF_INT 4 # define QSE_SIZEOF_LONG 4 -# define QSE_SIZEOF_LONG_LONG 8 +# if (__WATCOMC__ < 1200) +# define QSE_SIZEOF_LONG_LONG 0 +# else +# define QSE_SIZEOF_LONG_LONG 8 +# endif # if defined(_WIN64) # define QSE_SIZEOF_VOID_P 8 @@ -80,7 +84,12 @@ _M_X64 x64 platform # if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR) # define QSE_CHAR_IS_WCHAR 1 # endif -# undef QSE_ENABLE_BUNDLED_UNICODE + + /* old watcom c/c++ compiler requires this */ +# if (__WATCOMC__ < 1200) +# undef QSE_ENABLE_BUNDLED_UNICODE +# define QSE_ENABLE_BUNDLED_UNICODE 1 +# endif #elif defined(__GNUC__) || defined(__DMC__) || defined(__POCC__) # define QSE_SIZEOF_CHAR 1 @@ -118,7 +127,6 @@ _M_X64 x64 platform # if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR) # define QSE_CHAR_IS_WCHAR 1 # endif -# undef QSE_ENABLE_BUNDLED_UNICODE #elif defined(_MSC_VER) # define QSE_SIZEOF_CHAR 1 @@ -160,7 +168,6 @@ _M_X64 x64 platform # if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR) # define QSE_CHAR_IS_WCHAR 1 # endif -# undef QSE_ENABLE_BUNDLED_UNICODE #elif defined(__BORLANDC__) @@ -199,10 +206,9 @@ _M_X64 x64 platform # if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR) # define QSE_CHAR_IS_WCHAR 1 # endif -# undef QSE_ENABLE_BUNDLED_UNICODE #else # error Define the size of various data types. #endif -#include "conf-inf.h" +#include diff --git a/qse/include/qse/conf-os2.h b/qse/include/qse/conf-os2.h index af0cf3ff..869e4a25 100644 --- a/qse/include/qse/conf-os2.h +++ b/qse/include/qse/conf-os2.h @@ -35,7 +35,11 @@ # define QSE_SIZEOF_SHORT 2 # define QSE_SIZEOF_INT 4 # define QSE_SIZEOF_LONG 4 -# define QSE_SIZEOF_LONG_LONG 8 +# if (__WATCOMC__ < 1200) +# define QSE_SIZEOF_LONG_LONG 0 +# else +# define QSE_SIZEOF_LONG_LONG 8 +# endif # define QSE_SIZEOF_VOID_P 4 # define QSE_SIZEOF_FLOAT 4 # define QSE_SIZEOF_DOUBLE 8 @@ -65,7 +69,11 @@ # define QSE_CHAR_IS_WCHAR 1 # endif -# undef QSE_ENABLE_BUNDLED_UNICODE + /* old watcom c/c++ compiler requires this */ +# if (__WATCOMC__ < 1200) +# undef QSE_ENABLE_BUNDLED_UNICODE +# define QSE_ENABLE_BUNDLED_UNICODE 1 +# endif #elif defined(__BORLANDC__) # define QSE_SIZEOF_CHAR 1 diff --git a/qse/include/qse/conf-vms.h b/qse/include/qse/conf-vms.h index 82673ec9..bb5220de 100644 --- a/qse/include/qse/conf-vms.h +++ b/qse/include/qse/conf-vms.h @@ -116,4 +116,4 @@ #define QSE_MBLEN_MAX 8 -#include "conf-inf.h" +#include diff --git a/qse/include/qse/config.h.in b/qse/include/qse/config.h.in index 98a048a6..d6bda255 100644 --- a/qse/include/qse/config.h.in +++ b/qse/include/qse/config.h.in @@ -622,6 +622,9 @@ /* enable qse_sed_setexectracer() */ #undef QSE_ENABLE_SEDTRACER +/* include more built-in cmgrs like cp949 and cp950 */ +#undef QSE_ENABLE_XCMGRS + /* Big Endian */ #undef QSE_ENDIAN_BIG @@ -631,9 +634,6 @@ /* Unknown Endian */ #undef QSE_ENDIAN_UNKNOWN -/* include more built-in cmgrs like cp949 and cp950 */ -#undef QSE_INCLUDE_MORE_CMGRS - /* MB_LEN_MAX */ #undef QSE_MBLEN_MAX diff --git a/qse/lib/cmn/Makefile.am b/qse/lib/cmn/Makefile.am index 83c21a6c..5f231f60 100644 --- a/qse/lib/cmn/Makefile.am +++ b/qse/lib/cmn/Makefile.am @@ -112,7 +112,7 @@ if ENABLE_BUNDLED_UNICODE libqsecmn_la_SOURCES += uni.c endif -if INCLUDE_MORE_CMGRS +if ENABLE_XCMGRS libqsecmn_la_SOURCES += cp949.c cp950.c endif diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in index 1c00b760..2c19996a 100644 --- a/qse/lib/cmn/Makefile.in +++ b/qse/lib/cmn/Makefile.in @@ -36,7 +36,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @ENABLE_BUNDLED_UNICODE_TRUE@am__append_1 = uni.c -@INCLUDE_MORE_CMGRS_TRUE@am__append_2 = cp949.c cp950.c +@ENABLE_XCMGRS_TRUE@am__append_2 = cp949.c cp950.c @ENABLE_CXX_TRUE@am__append_3 = libqsecmnxx.la subdir = lib/cmn DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ @@ -100,7 +100,7 @@ am__libqsecmn_la_SOURCES_DIST = alg-base64.c alg-rand.c alg-search.c \ tre-match-backtrack.c tre-match-parallel.c tre-parse.c \ tre-stack.c uri.c utf8.c xma.c uni.c cp949.c cp950.c @ENABLE_BUNDLED_UNICODE_TRUE@am__objects_1 = uni.lo -@INCLUDE_MORE_CMGRS_TRUE@am__objects_2 = cp949.lo cp950.lo +@ENABLE_XCMGRS_TRUE@am__objects_2 = cp949.lo cp950.lo am_libqsecmn_la_OBJECTS = alg-base64.lo alg-rand.lo alg-search.lo \ alg-sort.lo assert.lo chr.lo dir.lo dll.lo env.lo gdl.lo \ htb.lo fio.lo fma.lo fmt.lo fs.lo fs-err.lo fs-move.lo glob.lo \ diff --git a/qse/lib/cmn/fio.c b/qse/lib/cmn/fio.c index 70b4c4b3..c1423b4f 100644 --- a/qse/lib/cmn/fio.c +++ b/qse/lib/cmn/fio.c @@ -32,6 +32,8 @@ # include #elif defined(__OS2__) # define INCL_DOSFILEMGR +# define INCL_DOSMODULEMGR +# define INCL_DOSPROCESS # define INCL_DOSERRORS # include #elif defined(__DOS__) @@ -178,6 +180,34 @@ static qse_fio_errnum_t syserr_to_errnum (int e) } #endif +#if defined(__OS2__) + +typedef APIRET (*DosOpenLType) ( + PSZ pszFileName, PHFILE pHf, PULONG pulAction, + LONGLONG cbFile, ULONG ulAttribute, + ULONG fsOpenFlags, ULONG fsOpenMode, + PEAOP2 peaop2 +); + +typedef APIRET (*DosSetFilePtrLType) ( + HFILE hFile, + LONGLONG ib, + ULONG method, + PLONGLONG ibActual +); + +typedef APIRET (*DosSetFileSizeLType) ( + HFILE hFile, + LONGLONG cbSize +); + +static int dos_set = 0; +static DosOpenLType dos_open_l = QSE_NULL; +static DosSetFilePtrLType dos_set_file_ptr_l = QSE_NULL; +static DosSetFileSizeLType dos_set_file_size_l = QSE_NULL; + +#endif + qse_fio_t* qse_fio_open ( qse_mmgr_t* mmgr, qse_size_t ext, const qse_char_t* path, int flags, int mode) @@ -216,6 +246,27 @@ int qse_fio_init ( int fellback = 0; #endif +#if defined(__OS2__) + if (!dos_set) + { + DosEnterCritSec (); + if (!dos_set) + { + HMODULE mod; + if (DosLoadModule(NULL, 0, "DOSCALL1", &mod) == NO_ERROR) + { + /* look up routines by ordinal */ + DosQueryProcAddr (mod, 981, NULL, (PFN*)&dos_open_l); + DosQueryProcAddr (mod, 988, NULL, (PFN*)&dos_set_file_ptr_l); + DosQueryProcAddr (mod, 989, NULL, (PFN*)&dos_set_file_size_l); + } + + dos_set = 1; + } + DosExitCritSec (); + } +#endif + QSE_MEMSET (fio, 0, QSE_SIZEOF(*fio)); fio->mmgr = mmgr; @@ -456,11 +507,6 @@ int qse_fio_init ( APIRET ret; ULONG action_taken = 0; ULONG open_action, open_mode, open_attr; - #if defined(FIL_STANDARDL) - LONGLONG zero; - #else - ULONG zero; - #endif #if defined(QSE_CHAR_IS_MCHAR) const qse_mchar_t* path_mb = path; @@ -498,13 +544,6 @@ int qse_fio_init ( } #endif - #if defined(FIL_STANDARDL) - zero.ulLo = 0; - zero.ulHi = 0; - #else - zero = 0; - #endif - if (flags & QSE_FIO_APPEND) fio->status |= STATUS_APPEND; @@ -559,19 +598,39 @@ int qse_fio_init ( open_attr = (mode & QSE_FIO_WUSR)? FILE_NORMAL: FILE_READONLY; #if defined(FIL_STANDARDL) - ret = DosOpenL ( - #else - ret = DosOpen ( + if (dos_open_l) + { + LONGLONG zero; + + zero.ulLo = 0; + zero.ulHi = 0; + ret = dos_open_l ( + path_mb, /* file name */ + &handle, /* file handle */ + &action_taken, /* store action taken */ + zero, /* size */ + open_attr, /* attribute */ + open_action, /* action if it exists */ + open_mode, /* open mode */ + 0L + ); + } + else + { + #endif + ret = DosOpen ( + path_mb, /* file name */ + &handle, /* file handle */ + &action_taken, /* store action taken */ + 0, /* size */ + open_attr, /* attribute */ + open_action, /* action if it exists */ + open_mode, /* open mode */ + 0L + ); + #if defined(FIL_STANDARDL) + } #endif - path_mb, /* file name */ - &handle, /* file handle */ - &action_taken, /* store action taken */ - zero, /* size */ - open_attr, /* attribute */ - open_action, /* action if it exists */ - open_mode, /* open mode */ - 0L - ); #if defined(QSE_CHAR_IS_MCHAR) /* nothing to do */ @@ -1033,36 +1092,41 @@ qse_fio_off_t qse_fio_seek ( }; #if defined(FIL_STANDARDL) - - LONGLONG pos, newpos; - APIRET ret; - - QSE_ASSERT (QSE_SIZEOF(offset) >= QSE_SIZEOF(pos)); - - pos.ulLo = (ULONG)(offset&0xFFFFFFFFlu); - pos.ulHi = (ULONG)(offset>>32); - - ret = DosSetFilePtrL (fio->handle, pos, seek_map[origin], &newpos); - if (ret != NO_ERROR) + if (dos_set_file_ptr_l) { - fio->errnum = syserr_to_errnum (ret); - return (qse_fio_off_t)-1; + LONGLONG pos, newpos; + APIRET ret; + + QSE_ASSERT (QSE_SIZEOF(offset) >= QSE_SIZEOF(pos)); + + pos.ulLo = (ULONG)(offset&0xFFFFFFFFlu); + pos.ulHi = (ULONG)(offset>>32); + + ret = dos_set_file_ptr_l (fio->handle, pos, seek_map[origin], &newpos); + if (ret != NO_ERROR) + { + fio->errnum = syserr_to_errnum (ret); + return (qse_fio_off_t)-1; + } + + return ((qse_fio_off_t)newpos.ulHi << 32) | newpos.ulLo; } - - return ((qse_fio_off_t)newpos.ulHi << 32) | newpos.ulLo; - - #else - ULONG newpos; - APIRET ret; - - ret = DosSetFilePtr (fio->handle, offset, seek_map[origin], &newpos); - if (ret != NO_ERROR) + else { - fio->errnum = syserr_to_errnum (ret); - return (qse_fio_off_t)-1; - } + #endif + ULONG newpos; + APIRET ret; - return newpos; + ret = DosSetFilePtr (fio->handle, offset, seek_map[origin], &newpos); + if (ret != NO_ERROR) + { + fio->errnum = syserr_to_errnum (ret); + return (qse_fio_off_t)-1; + } + + return newpos; + #if defined(FIL_STANDARDL) + } #endif #elif defined(__DOS__) @@ -1123,15 +1187,22 @@ int qse_fio_truncate (qse_fio_t* fio, qse_fio_off_t size) APIRET ret; #if defined(FIL_STANDARDL) - LONGLONG sz; - /* the file must have the write access for it to succeed */ + if (dos_set_file_size_l) + { + LONGLONG sz; + /* the file must have the write access for it to succeed */ - sz.ulLo = (ULONG)(size&0xFFFFFFFFlu); - sz.ulHi = (ULONG)(size>>32); + sz.ulLo = (ULONG)(size&0xFFFFFFFFlu); + sz.ulHi = (ULONG)(size>>32); - ret = DosSetFileSizeL (fio->handle, sz); - #else - ret = DosSetFileSize (fio->handle, size); + ret = DosSetFileSizeL (fio->handle, sz); + } + else + { + #endif + ret = DosSetFileSize (fio->handle, size); + #if defined(FIL_STANDARDL) + } #endif if (ret != NO_ERROR) @@ -1274,13 +1345,20 @@ qse_ssize_t qse_fio_write (qse_fio_t* fio, const void* data, qse_size_t size) { /* i do this on a best-effort basis */ #if defined(FIL_STANDARDL) - LONGLONG pos, newpos; - pos.ulLo = (ULONG)0; - pos.ulHi = (ULONG)0; - DosSetFilePtrL (fio->handle, pos, FILE_END, &newpos); - #else - ULONG newpos; - DosSetFilePtr (fio->handle, 0, FILE_END, &newpos); + if (dos_set_file_ptr_l) + { + LONGLONG pos, newpos; + pos.ulLo = (ULONG)0; + pos.ulHi = (ULONG)0; + dos_set_file_ptr_l (fio->handle, pos, FILE_END, &newpos); + } + else + { + #endif + ULONG newpos; + DosSetFilePtr (fio->handle, 0, FILE_END, &newpos); + #if defined(FIL_STANDARDL) + } #endif } diff --git a/qse/lib/cmn/mbwc.c b/qse/lib/cmn/mbwc.c index 85feba82..1b39c73d 100644 --- a/qse/lib/cmn/mbwc.c +++ b/qse/lib/cmn/mbwc.c @@ -39,7 +39,7 @@ static qse_cmgr_t builtin_cmgr[] = qse_slwctoslmb }, -#if defined(QSE_INCLUDE_MORE_CMGRS) +#if defined(QSE_ENABLE_XCMGRS) { qse_cp949touc, qse_uctocp949 @@ -91,7 +91,7 @@ qse_cmgr_t* qse_findcmgr (const qse_char_t* name) } tab[] = { { QSE_T("utf8"), QSE_CMGR_UTF8 }, -#if defined(QSE_INCLUDE_MORE_CMGRS) +#if defined(QSE_ENABLE_XCMGRS) { QSE_T("cp949"), QSE_CMGR_CP949 }, { QSE_T("cp950"), QSE_CMGR_CP950 }, #endif diff --git a/qse/lib/cmn/mux.c b/qse/lib/cmn/mux.c index 25dda42b..9a01570f 100644 --- a/qse/lib/cmn/mux.c +++ b/qse/lib/cmn/mux.c @@ -30,12 +30,17 @@ # include # include # include -# include # include # include +# if defined(TCPV40HDRS) +# define USE_SELECT +# define BSD_SELECT +# include +# else +# include +# endif # define INCL_DOSERRORS # include -# pragma library("tcpip32.lib") #elif defined(__DOS__) # include @@ -64,15 +69,7 @@ struct qse_mux_t qse_mux_errnum_t errnum; qse_mux_evtfun_t evtfun; -#if defined(__OS2__) - int* fdarr; - int size; - struct - { - qse_mux_evt_t** ptr; - int ubound; - } me; -#elif defined(USE_SELECT) +#if defined(USE_SELECT) fd_set rset; fd_set wset; fd_set tmprset; @@ -98,6 +95,14 @@ struct qse_mux_t qse_mux_evt_t** ptr; int ubound; } me; +#elif defined(__OS2__) + int* fdarr; + int size; + struct + { + qse_mux_evt_t** ptr; + int ubound; + } me; #endif }; @@ -140,8 +145,10 @@ static qse_mux_errnum_t syserr_to_errnum (int e) { switch (e) { + #if defined(SOCENOMEM) case SOCENOMEM: return QSE_MUX_ENOMEM; + #endif case SOCEINVAL: return QSE_MUX_EINVAL; @@ -149,11 +156,15 @@ static qse_mux_errnum_t syserr_to_errnum (int e) case SOCEACCES: return QSE_MUX_EACCES; + #if defined(SOCENOENT) case SOCENOENT: return QSE_MUX_ENOENT; + #endif + #if defined(SOCEEXIST) case SOCEEXIST: return QSE_MUX_EEXIST; + #endif case SOCEINTR: return QSE_MUX_EINTR; @@ -252,10 +263,7 @@ int qse_mux_init (qse_mux_t* mux, qse_mmgr_t* mmgr, qse_mux_evtfun_t evtfun, qse * event buffers */ if (capahint <= 0) capahint = 1; -#if defined(__OS2__) - /* nothing special to do */ - -#elif defined(USE_SELECT) +#if defined(USE_SELECT) FD_ZERO (&mux->rset); FD_ZERO (&mux->wset); mux->maxhnd = -1; @@ -281,6 +289,9 @@ int qse_mux_init (qse_mux_t* mux, qse_mmgr_t* mmgr, qse_mux_evtfun_t evtfun, qse } #endif +#elif defined(__OS2__) + /* nothing special to do */ + #else /* TODO: */ mux->errnum = QSE_MUX_ENOIMPL; @@ -292,24 +303,8 @@ int qse_mux_init (qse_mux_t* mux, qse_mmgr_t* mmgr, qse_mux_evtfun_t evtfun, qse void qse_mux_fini (qse_mux_t* mux) { -#if defined(__OS2__) - if (mux->me.ptr) - { - int i; - for (i = 0; i < mux->me.ubound; i++) - { - if (mux->me.ptr[i]) - QSE_MMGR_FREE (mux->mmgr, mux->me.ptr[i]); - } - - QSE_MMGR_FREE (mux->mmgr, mux->me.ptr); - mux->me.ubound = 0; - } - - if (mux->fdarr) QSE_MMGR_FREE (mux->mmgr, mux->fdarr); - -#elif defined(USE_SELECT) +#if defined(USE_SELECT) FD_ZERO (&mux->rset); FD_ZERO (&mux->wset); @@ -351,6 +346,23 @@ void qse_mux_fini (qse_mux_t* mux) QSE_MMGR_FREE (mux->mmgr, mux->me.ptr); mux->me.ubound = 0; } + +#elif defined(__OS2__) + if (mux->me.ptr) + { + int i; + + for (i = 0; i < mux->me.ubound; i++) + { + if (mux->me.ptr[i]) + QSE_MMGR_FREE (mux->mmgr, mux->me.ptr[i]); + } + + QSE_MMGR_FREE (mux->mmgr, mux->me.ptr); + mux->me.ubound = 0; + } + + if (mux->fdarr) QSE_MMGR_FREE (mux->mmgr, mux->fdarr); #endif } @@ -373,54 +385,7 @@ qse_mux_errnum_t qse_mux_geterrnum (qse_mux_t* mux) int qse_mux_insert (qse_mux_t* mux, const qse_mux_evt_t* evt) { -#if defined(__OS2__) - - if (evt->hnd >= mux->me.ubound) - { - qse_mux_evt_t** tmp; - int* fatmp; - int ubound; - - ubound = evt->hnd + 1; - ubound = ALIGN_TO (ubound, 128); - - tmp = QSE_MMGR_REALLOC (mux->mmgr, mux->me.ptr, QSE_SIZEOF(*mux->me.ptr) * ubound); - if (tmp == QSE_NULL) - { - mux->errnum = QSE_MUX_ENOMEM; - return -1; - } - - /* maintain this array double the size of the highest handle + 1 */ - fatmp = QSE_MMGR_REALLOC (mux->mmgr, mux->fdarr, QSE_SIZEOF(*mux->fdarr) * (ubound * 2)); - if (fatmp == QSE_NULL) - { - QSE_MMGR_FREE (mux->mmgr, tmp); - mux->errnum = QSE_MUX_ENOMEM; - return -1; - } - - QSE_MEMSET (&tmp[mux->me.ubound], 0, QSE_SIZEOF(*mux->me.ptr) * (ubound - mux->me.ubound)); - mux->me.ptr = tmp; - mux->me.ubound = ubound; - mux->fdarr = fatmp; - } - - if (!mux->me.ptr[evt->hnd]) - { - mux->me.ptr[evt->hnd] = QSE_MMGR_ALLOC (mux->mmgr, QSE_SIZEOF(*evt)); - if (!mux->me.ptr[evt->hnd]) - { - mux->errnum = QSE_MUX_ENOMEM; - return -1; - } - } - - *mux->me.ptr[evt->hnd] = *evt; - mux->size++; - return 0; - -#elif defined(USE_SELECT) +#if defined(USE_SELECT) /* TODO: windows seems to return a pretty high file descriptors * using an array to store information may not be so effcient. @@ -540,6 +505,54 @@ int qse_mux_insert (qse_mux_t* mux, const qse_mux_evt_t* evt) mux->ee.len++; return 0; +#elif defined(__OS2__) + + if (evt->hnd >= mux->me.ubound) + { + qse_mux_evt_t** tmp; + int* fatmp; + int ubound; + + ubound = evt->hnd + 1; + ubound = ALIGN_TO (ubound, 128); + + tmp = QSE_MMGR_REALLOC (mux->mmgr, mux->me.ptr, QSE_SIZEOF(*mux->me.ptr) * ubound); + if (tmp == QSE_NULL) + { + mux->errnum = QSE_MUX_ENOMEM; + return -1; + } + + /* maintain this array double the size of the highest handle + 1 */ + fatmp = QSE_MMGR_REALLOC (mux->mmgr, mux->fdarr, QSE_SIZEOF(*mux->fdarr) * (ubound * 2)); + if (fatmp == QSE_NULL) + { + QSE_MMGR_FREE (mux->mmgr, tmp); + mux->errnum = QSE_MUX_ENOMEM; + return -1; + } + + QSE_MEMSET (&tmp[mux->me.ubound], 0, QSE_SIZEOF(*mux->me.ptr) * (ubound - mux->me.ubound)); + mux->me.ptr = tmp; + mux->me.ubound = ubound; + mux->fdarr = fatmp; + } + + if (!mux->me.ptr[evt->hnd]) + { + mux->me.ptr[evt->hnd] = QSE_MMGR_ALLOC (mux->mmgr, QSE_SIZEOF(*evt)); + if (!mux->me.ptr[evt->hnd]) + { + mux->errnum = QSE_MUX_ENOMEM; + return -1; + } + } + + *mux->me.ptr[evt->hnd] = *evt; + mux->size++; + return 0; + + #else /* TODO: */ mux->errnum = QSE_MUX_ENOIMPL; @@ -549,30 +562,7 @@ int qse_mux_insert (qse_mux_t* mux, const qse_mux_evt_t* evt) int qse_mux_delete (qse_mux_t* mux, const qse_mux_evt_t* evt) { -#if defined(__OS2__) - - qse_mux_evt_t* mevt; - - if (mux->size <= 0 || evt->hnd < 0 || evt->hnd >= mux->me.ubound) - { - mux->errnum = QSE_MUX_EINVAL; - return -1; - } - - mevt = mux->me.ptr[evt->hnd]; - if (mevt->hnd != evt->hnd) - { - /* already deleted??? */ - mux->errnum = QSE_MUX_EINVAL; - return -1; - } - - mevt->hnd = -1; - mevt->mask = 0; - mux->size--; - return 0; - -#elif defined(USE_SELECT) +#if defined(USE_SELECT) qse_mux_evt_t* mevt; if (mux->size <= 0 || evt->hnd < 0 || evt->hnd >= mux->me.ubound) @@ -632,6 +622,30 @@ done: mux->ee.len--; return 0; + +#elif defined(__OS2__) + + qse_mux_evt_t* mevt; + + if (mux->size <= 0 || evt->hnd < 0 || evt->hnd >= mux->me.ubound) + { + mux->errnum = QSE_MUX_EINVAL; + return -1; + } + + mevt = mux->me.ptr[evt->hnd]; + if (mevt->hnd != evt->hnd) + { + /* already deleted??? */ + mux->errnum = QSE_MUX_EINVAL; + return -1; + } + + mevt->hnd = -1; + mevt->mask = 0; + mux->size--; + return 0; + #else /* TODO */ @@ -642,63 +656,7 @@ done: int qse_mux_poll (qse_mux_t* mux, const qse_ntime_t* tmout) { -#if defined(__OS2__) - - qse_mux_evt_t* evt; - long tv; - int n, i, count, rcount, wcount; - - tv = QSE_SEC_TO_MSEC(tmout->sec) + QSE_NSEC_TO_MSEC (tmout->nsec); - - /* - * be aware that reconstructing this array every time is pretty - * inefficient. - */ - count = 0; - for (i = 0; i < mux->me.ubound; i++) - { - evt = mux->me.ptr[i]; - if (evt && (evt->mask & QSE_MUX_IN)) mux->fdarr[count++] = evt->hnd; - } - rcount = count; - for (i = 0; i < mux->me.ubound; i++) - { - evt = mux->me.ptr[i]; - if (evt && (evt->mask & QSE_MUX_OUT)) mux->fdarr[count++] = evt->hnd; - } - wcount = count - rcount; - - n = os2_select (mux->fdarr, rcount, wcount, 0, tv); - if (n <= -1) - { - mux->errnum = syserr_to_errnum(sock_errno()); - return -1; - } - - if (n >= 1) - { - qse_mux_evt_t xevt; - - for (i = 0; i < count; i++) - { - if (mux->fdarr[i] == -1) continue; - - evt = mux->me.ptr[mux->fdarr[i]]; - if (!evt || evt->hnd != mux->fdarr[i]) continue; - - xevt = *evt; - - /* due to the way i check 'fdarr' , it can't have - * both IN and OUT at the same time. they are - * triggered separately */ - xevt.mask = (i < rcount)? QSE_MUX_IN: QSE_MUX_OUT; - mux->evtfun (mux, &xevt); - } - } - - return n; - -#elif defined(USE_SELECT) +#if defined(USE_SELECT) struct timeval tv; int n; @@ -782,6 +740,63 @@ int qse_mux_poll (qse_mux_t* mux, const qse_ntime_t* tmout) return nfds; +#elif defined(__OS2__) + + qse_mux_evt_t* evt; + long tv; + int n, i, count, rcount, wcount; + + tv = QSE_SEC_TO_MSEC(tmout->sec) + QSE_NSEC_TO_MSEC (tmout->nsec); + + /* + * be aware that reconstructing this array every time is pretty + * inefficient. + */ + count = 0; + for (i = 0; i < mux->me.ubound; i++) + { + evt = mux->me.ptr[i]; + if (evt && (evt->mask & QSE_MUX_IN)) mux->fdarr[count++] = evt->hnd; + } + rcount = count; + for (i = 0; i < mux->me.ubound; i++) + { + evt = mux->me.ptr[i]; + if (evt && (evt->mask & QSE_MUX_OUT)) mux->fdarr[count++] = evt->hnd; + } + wcount = count - rcount; + + n = os2_select (mux->fdarr, rcount, wcount, 0, tv); + if (n <= -1) + { + mux->errnum = syserr_to_errnum(sock_errno()); + return -1; + } + + if (n >= 1) + { + qse_mux_evt_t xevt; + + for (i = 0; i < count; i++) + { + if (mux->fdarr[i] == -1) continue; + + evt = mux->me.ptr[mux->fdarr[i]]; + if (!evt || evt->hnd != mux->fdarr[i]) continue; + + xevt = *evt; + + /* due to the way i check 'fdarr' , it can't have + * both IN and OUT at the same time. they are + * triggered separately */ + xevt.mask = (i < rcount)? QSE_MUX_IN: QSE_MUX_OUT; + mux->evtfun (mux, &xevt); + } + } + + return n; + + #else /* TODO */ mux->errnum = QSE_MUX_ENOIMPL; diff --git a/qse/lib/cmn/nwif-cfg.c b/qse/lib/cmn/nwif-cfg.c index 5a2f761a..32faef48 100644 --- a/qse/lib/cmn/nwif-cfg.c +++ b/qse/lib/cmn/nwif-cfg.c @@ -31,10 +31,13 @@ # include # include # include -# include # include # include -# pragma library("tcpip32.lib") +# if defined(TCPV40HDRS) +# include +# else +# include +# endif #elif defined(__DOS__) /* TODO: */ #else diff --git a/qse/lib/cmn/nwio.c b/qse/lib/cmn/nwio.c index a369149d..62d7bd13 100644 --- a/qse/lib/cmn/nwio.c +++ b/qse/lib/cmn/nwio.c @@ -26,16 +26,19 @@ # include # include /* sockaddr_in6 */ # include -# pragma library("ws2_32.lib") /* watcom */ -# pragma comment(lib,"ws2_32.lib") /* msvc and borland */ +# define USE_SELECT #elif defined(__OS2__) # include # include # include -# include # include # include -# pragma library("tcpip32.lib") +# if defined(TCPV40HDRS) +# define USE_SELECT +# include +# else +# include +# endif #elif defined(__DOS__) /* TODO: consider watt-32 */ #else @@ -43,6 +46,7 @@ # include # include # include +# define USE_SELECT #endif enum @@ -92,8 +96,10 @@ static qse_nwio_errnum_t syserr_to_errnum (int e) { switch (e) { + #if defined(SOCENOMEM) case SOCENOMEM: return QSE_NWIO_ENOMEM; + #endif case SOCEINVAL: return QSE_NWIO_EINVAL; @@ -101,11 +107,15 @@ static qse_nwio_errnum_t syserr_to_errnum (int e) case SOCEACCES: return QSE_NWIO_EACCES; + #if defined(SOCENOENT) case SOCENOENT: return QSE_NWIO_ENOENT; + #endif + #if defined(SOCEXIST) case SOCEEXIST: return QSE_NWIO_EEXIST; + #endif case SOCEINTR: return QSE_NWIO_EINTR; @@ -205,7 +215,7 @@ static int wait_for_data (qse_nwio_t* nwio, const qse_ntime_t* tmout, int what) { int xret; -#if defined(_WIN32) +#if defined(USE_SELECT) fd_set fds[2]; struct timeval tv; @@ -218,9 +228,19 @@ static int wait_for_data (qse_nwio_t* nwio, const qse_ntime_t* tmout, int what) tv.tv_usec = QSE_NSEC_TO_USEC (tmout->nsec); xret = select (nwio->handle + 1, &fds[0], &fds[1], QSE_NULL, &tv); + #if defined(_WIN32) if (xret == SOCKET_ERROR) + #else + if (xret <= -1) + #endif { + #if defined(_WIN32) nwio->errnum = syserr_to_errnum (WSAGetLastError()); + #elif defined(__OS2__) + nwio->errnum = syserr_to_errnum (sock_errno()); + #else + nwio->errnum = syserr_to_errnum (errno); + #endif return -1; } else if (xret == 0) @@ -228,6 +248,8 @@ static int wait_for_data (qse_nwio_t* nwio, const qse_ntime_t* tmout, int what) nwio->errnum = QSE_NWIO_ETMOUT; return -1; } + return 0; + #elif defined(__OS2__) int count[2] = { 0, 0 }; long tmout_msecs; @@ -246,37 +268,13 @@ static int wait_for_data (qse_nwio_t* nwio, const qse_ntime_t* tmout, int what) nwio->errnum = QSE_NWIO_ETMOUT; return -1; } - -#elif defined(__DOS__) - nwio->errnum = QSE_NWIO_ENOIMPL; - return -1; + return 0; #else - - fd_set fds[2]; - struct timeval tv; - - tv.tv_sec = tmout->sec; - tv.tv_usec = QSE_NSEC_TO_USEC (tmout->nsec); - - FD_ZERO (&fds[0]); - FD_ZERO (&fds[1]); - FD_SET (nwio->handle, &fds[what]); - - xret = select (nwio->handle + 1, &fds[0], &fds[1], QSE_NULL, &tv); - if (xret <= -1) - { - nwio->errnum = syserr_to_errnum (errno); - return -1; - } - else if (xret == 0) - { - nwio->errnum = QSE_NWIO_ETMOUT; - return -1; - } + nwio->errnum = QSE_NWIO_ENOIMPL; + return -1; #endif - return 0; } qse_nwio_t* qse_nwio_open ( @@ -591,7 +589,7 @@ int qse_nwio_init ( { int noblk = 1; - if (ioctl (nwio->handle, FIONBIO, &noblk, QSE_SIZEOF(noblk)) <= -1) + if (ioctl (nwio->handle, FIONBIO, (void*)&noblk, QSE_SIZEOF(noblk)) <= -1) { nwio->errnum = syserr_to_errnum (sock_errno()); goto oops; @@ -605,7 +603,7 @@ int qse_nwio_init ( int noblk = 0; if ((xret <= -1 && sock_errno() != SOCEINPROGRESS) || - ioctl (nwio->handle, FIONBIO, &noblk, QSE_SIZEOF(noblk)) <= -1) + ioctl (nwio->handle, FIONBIO, (void*)&noblk, QSE_SIZEOF(noblk)) <= -1) { nwio->errnum = syserr_to_errnum (sock_errno()); goto oops; diff --git a/qse/lib/cmn/pio.c b/qse/lib/cmn/pio.c index 50d2efd6..b4b87e3b 100644 --- a/qse/lib/cmn/pio.c +++ b/qse/lib/cmn/pio.c @@ -954,6 +954,7 @@ create_process: zero.ulLo = 0; zero.ulHi = 0; + /* TODO: selective between DosOpenL and DosOpen */ rc = DosOpenL ( QSE_MT("NUL"), &os2devnul, diff --git a/qse/lib/net/http.c b/qse/lib/net/http.c index 853245de..c9eafe0b 100644 --- a/qse/lib/net/http.c +++ b/qse/lib/net/http.c @@ -377,7 +377,7 @@ qse_mchar_t* qse_fmthttptime ( /* TODO: avoid using snprintf () */ -#if defined(_WIN32) && defined(_MSC_VER) +#if defined(_MSC_VER) || (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) _snprintf (buf, bufsz, #else snprintf (buf, bufsz, diff --git a/qse/lib/net/httpd-std.c b/qse/lib/net/httpd-std.c index b94c44f3..57ecb35f 100644 --- a/qse/lib/net/httpd-std.c +++ b/qse/lib/net/httpd-std.c @@ -36,24 +36,25 @@ # include # include /* sockaddr_in6 */ # include -# pragma library("ws2_32.lib") /* watcom */ -# pragma comment(lib,"ws2_32.lib") /* msvc and borland */ # define EPOCH_DIFF_YEARS (QSE_EPOCH_YEAR-QSE_EPOCH_YEAR_WIN) # define EPOCH_DIFF_DAYS ((qse_long_t)EPOCH_DIFF_YEARS*365+EPOCH_DIFF_YEARS/4-3) # define EPOCH_DIFF_SECS ((qse_long_t)EPOCH_DIFF_DAYS*24*60*60) #elif defined(__OS2__) -# define INCL_DOSERRORS -# define INCL_DOSFILEMGR -# include # include # include # include -# include # include # include -# pragma library("tcpip32.lib") +# if defined(TCPV40HDRS) +# include +# else +# include +# endif +# define INCL_DOSERRORS +# define INCL_DOSFILEMGR +# include #elif defined(__DOS__) /* TODO */ @@ -1013,7 +1014,7 @@ static int mux_poll (qse_httpd_t* httpd, void* vmux, const qse_ntime_t* tmout) static int mux_readable (qse_httpd_t* httpd, qse_ubi_t handle, const qse_ntime_t* tmout) { -#if defined(__OS2__) +#if defined(__OS2__) && !defined(TCPV40HDRS) long tv; tv = tmout? QSE_SECNSEC_TO_MSEC (tmout->sec, tmout->nsec): -1; @@ -1039,7 +1040,7 @@ static int mux_readable (qse_httpd_t* httpd, qse_ubi_t handle, const qse_ntime_t static int mux_writable (qse_httpd_t* httpd, qse_ubi_t handle, const qse_ntime_t* tmout) { -#if defined(__OS2__) +#if defined(__OS2__) && !defined(TCPV40HDRS) long tv; tv = tmout? QSE_SECNSEC_TO_MSEC (tmout->sec, tmout->nsec): -1; return os2_select (&handle.i, 0, 1, 0, tv); diff --git a/qse/lib/net/httpd.h b/qse/lib/net/httpd.h index 0a4415ac..2f93fc9b 100644 --- a/qse/lib/net/httpd.h +++ b/qse/lib/net/httpd.h @@ -87,7 +87,7 @@ struct qse_httpd_t #define CLIENT_TASK_TRIGGER_IN_MUX(i) (1 << ((i) + 8)) -#if defined(_WIN32) && defined(_MSC_VER) +#if defined(_MSC_VER) || (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) # define snprintf _snprintf # define vsnprintf _vsnprintf #endif