diff --git a/.github/workflows/build-watcom.yml b/.github/workflows/build-watcom.yml index 5afb6cd..df05f50 100644 --- a/.github/workflows/build-watcom.yml +++ b/.github/workflows/build-watcom.yml @@ -32,7 +32,7 @@ jobs: shell: cmd run: | echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c - nmake /F Makefile.watcom + wmake -f Makefile.watcom - name: make dist dir shell: cmd run: | diff --git a/Makefile.watcom b/Makefile.watcom index 5df122e..8cb262f 100644 --- a/Makefile.watcom +++ b/Makefile.watcom @@ -5,22 +5,22 @@ # Add /DSAFESQL to CFLAGS if you are using poorely written/tested ODBC driver BUILDDIR = ../bin/ -CC = cl -CFLAGS = /nologo /Ox /MT /D "NOIPV6" /D "NODEBUG" /D "NOODBC" /D "NORADIUS" /D"WATCOM" /D "MSVC" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRId64=\"I64d\"" /D "PRIu64=\"I64u\"" /D "SCNu64=\"I64u\"" /D "SCNx64=\"I64x\"" /D "SCNd64=\"I64d\"" /D "PRIx64=\"I64x\"" /c $(VERSION) $(BUILDDATE) -COUT = /Fo -LN = link -LDFLAGS = /nologo /subsystem:console /incremental:no -DLFLAGS = /DLL +CC = wcl386 +CFLAGS = -bt=nt -oaxt -bm -d"NOIPV6" -d"NODEBUG" -d"NOODBC" -d"NORADIUS" -d"WATCOM" -d"MSVC" -d"WIN32" -d"_CONSOLE" -d"_MBCS" -d"_WIN32" -d"PRId64=\"I64d\"" -d"PRIu64=\"I64u\"" -d"SCNu64=\"I64u\"" -d"SCNx64=\"I64x\"" -d"SCNd64=\"I64d\"" -d"PRIx64=\"I64x\"" -c $(VERSION) $(BUILDDATE) +COUT = -fo +LN = wlink +LDFLAGS = system nt option console +DLFLAGS = -bd DLSUFFICS = .dll LIBS = ws2_32.lib advapi32.lib user32.lib kernel32.lib LIBSOLD = libeay32MT.lib ssleay32MT.lib LIBSPREFIX = LIBSSUFFIX = .lib LIBEXT = .lib -LNOUT = /out: +LNOUT = "name " EXESUFFICS = .exe OBJSUFFICS = .obj -DEFINEOPTION = /D +DEFINEOPTION = -d COMPFILES = *.pch *.idb *.err REMOVECOMMAND = del 2>NUL >NUL TYPECOMMAND = type @@ -41,24 +41,24 @@ allplugins: copy Makefile plugins\utf8tocp1251 copy Makefile.var plugins\utf8tocp1251 cd plugins\utf8tocp1251 - nmake + wmake del *.obj *.idb cd ../../ copy Makefile plugins\WindowsAuthentication copy Makefile.var plugins\WindowsAuthentication cd plugins\WindowsAuthentication - nmake + wmake del *.obj *.idb cd ../../ copy Makefile plugins\TrafficPlugin copy Makefile.var plugins\TrafficPlugin cd plugins\TrafficPlugin - nmake + wmake del *.obj *.idb cd ../../ copy Makefile plugins\StringsPlugin copy Makefile.var plugins\StringsPlugin cd plugins\StringsPlugin - nmake + wmake del *.obj *.idb cd ../../