summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Pamment <apamment@yandex.com>2018-11-04 17:45:02 +1000
committerAndrew Pamment <apamment@yandex.com>2018-11-04 17:45:02 +1000
commit988151d11ae1f461c21bbc040c1c13e56bbc4f7b (patch)
tree9c7a815507442848e191a80ccd934151727e46ab
parenta9d4afb76d90c6a05f7889ed67553cf7d4848211 (diff)
qwknet added to main makefile
-rw-r--r--src/GNUmakefile.common8
-rw-r--r--utils/qwknet/Makefile6
-rw-r--r--utils/qwknet/qwkscan.c4
3 files changed, 11 insertions, 7 deletions
diff --git a/src/GNUmakefile.common b/src/GNUmakefile.common
index c51e08a..748ace6 100644
--- a/src/GNUmakefile.common
+++ b/src/GNUmakefile.common
@@ -14,10 +14,10 @@ UUID:= ${DEPSDIR}/libuuid/.libs/libuuid.a
CUTEST:= ${DEPSDIR}/cutest-1.5/libcutest.a
all: magicka magimail magiedit ticproc mgpost magichat \
- filecenter dosbox_shim magiftpd reset_pass
+ filecenter dosbox_shim magiftpd reset_pass qwknet
www: magickawww magimail magiedit ticproc mgpost magichat \
- filecenter dosbox_shim magiftpd reset_pass
+ filecenter dosbox_shim magiftpd reset_pass qwknet
${LUA}:
cd ${DEPSDIR}/lua && ${MAKE} -f Makefile ${DEPS_LUA_TARGET} MAKEFLAGS= CC=${CC}
@@ -100,6 +100,9 @@ magiftpd:
reset_pass:
cd ${UTILSDIR}/reset_pass && ${MAKE}
+qwknet:
+ cd ${UTILSDIR}/qwknet && ${MAKE}
+
.PHONY: clean www
clean:
@@ -123,3 +126,4 @@ clean:
cd ${DEPSDIR}/libuuid && rm -rf .libs
cd ${DEPSDIR}/cutest-1.5 && ${MAKE} clean
cd ${DEPSDIR}/jsmn && ${MAKE} clean
+ cd ${UTILSDIR}/qwknet && ${MAKE} clean
diff --git a/utils/qwknet/Makefile b/utils/qwknet/Makefile
index 74b2eb9..4d06f48 100644
--- a/utils/qwknet/Makefile
+++ b/utils/qwknet/Makefile
@@ -1,5 +1,5 @@
CC=cc
-CFLAGS=-I/usr/local/include -ggdb
+CFLAGS=-I/usr/local/include
DEPS = qwktoss.c qwkscan.c
JAMLIB = ../../deps/jamlib/jamlib.a
OBJ = qwktoss.o ../../src/inih/ini.o
@@ -11,7 +11,7 @@ all: qwktoss qwkscan
$(CC) -c -o $@ $< $(CFLAGS)
$(JAMLIB):
- cd ../../deps/jamlib && make -f Makefile.linux
+ cd ../../deps/jamlib && make -f $(JAMMAKE)
qwktoss: $(OBJ) $(JAMLIB)
$(CC) -o qwktoss $^ $(CFLAGS) -L/usr/local/lib
@@ -22,4 +22,4 @@ qwkscan: $(SOBJ) $(JAMLIB)
.PHONY: clean
clean:
- rm -f $(OBJ) qwktoss \ No newline at end of file
+ rm -f $(OBJ) $(SOBJ) qwktoss qwkscan
diff --git a/utils/qwknet/qwkscan.c b/utils/qwknet/qwkscan.c
index 848aca3..4861c56 100644
--- a/utils/qwknet/qwkscan.c
+++ b/utils/qwknet/qwkscan.c
@@ -311,7 +311,7 @@ int export_messages(int baseno, char *basefilename, int qwkidx) {
snprintf(buffer, PATH_MAX, "%s/HEADERS.DAT", temp_dir);
hdrptr = fopen(buffer, "a");
- fprintf(hdrptr, "[%x]\n", offset);
+ fprintf(hdrptr, "[%lx]\n", offset);
if (msgid != NULL) {
fprintf(hdrptr, "Message-ID: %s\n", msgid);
free(msgid);
@@ -452,4 +452,4 @@ int main(int argc, char **argv) {
}
}
recursive_delete(temp_dir);
-} \ No newline at end of file
+}