From 51b3085fb995705e2f8fa0ebea3dcbb80758bb04 Mon Sep 17 00:00:00 2001 From: nishi Date: Sat, 25 May 2024 15:54:21 +0000 Subject: [PATCH] fix makefiles git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@111 d4a5a174-5a4a-5b4b-b672-37683c10d7d5 --- Platforms/watcom.mk | 18 ------------------ common.mk | 20 +++++++++++++++++++- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Platforms/watcom.mk b/Platforms/watcom.mk index dea4eff..5e1d293 100644 --- a/Platforms/watcom.mk +++ b/Platforms/watcom.mk @@ -14,21 +14,3 @@ PLATFORM_M = $(WATCOM_PLATFORM) PLATFORM_P = $(WATCOM_PLATFORM) CFLAGS += -DDOS -b $(WATCOM_PLATFORM) LDFLAGS += -b $(WATCOM_PLATFORM) - -dosbox: no-doc - echo 'create_table("test", "string:key", "double:value");' > op.txt - echo '.tables' >> op.txt - echo "[cpu]" > dosbox.conf - echo "cycles=12000" >> dosbox.conf - echo "[autoexec]" >> dosbox.conf - echo "mount c: ." >> dosbox.conf - echo "c:" >> dosbox.conf - echo "copy Client\*$(EXEC_SUFFIX) dw$(EXEC_SUFFIX)" >> dosbox.conf - echo "dw -NC -f op.txt --create db.dwf" >> dosbox.conf - echo "pause" >> dosbox.conf - echo "del db.dwf" >> dosbox.conf - echo "del dw.exe" >> dosbox.conf - echo "exit" >> dosbox.conf - if [ ! -e "dos4gw.exe" ]; then wget "https://github.com/yetmorecode/dos32a-ng/releases/download/9.1.2/DOS32ANG.EXE" -O dos4gw.exe ; fi - dosbox - rm op.txt dosbox.conf \ No newline at end of file diff --git a/common.mk b/common.mk index 1722444..fd7408b 100644 --- a/common.mk +++ b/common.mk @@ -2,7 +2,7 @@ COMPILE_FLAGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LIB_PREFIX="$(LIB_PREFIX)" LIB_SUFFIX="$(LIB_SUFFIX)" EXEC_SUFFIX="$(EXEC_SUFFIX)" PLATFORM_M="$(PLATFORM_M)" PLATFORM_P="$(PLATFORM_P)" STATICLIB_PREFIX="$(STATICLIB_PREFIX)" STATICLIB_SUFFIX="$(STATICLIB_SUFFIX)" AR="$(AR)" RANLIB="$(RANLIB)" SHCC="$(SHCC)" LINK_LIB="$(LINK_LIB)" AR_ARGS="$(AR_ARGS)" -.PHONY: all no-doc replace format clean ./Library ./Client ./Document archive archive-prepare archive-cleanup archive-targz archive-zip +.PHONY: all no-doc replace format clean ./Library ./Client ./Document archive archive-prepare archive-cleanup archive-targz archive-zip dosbox all: ./Library ./Client ./Document @@ -68,3 +68,21 @@ archive: -$(MAKE) archive-targz PREP=NO -$(MAKE) archive-zip PREP=NO $(MAKE) archive-cleanup + +dosbox: no-doc + echo 'create_table("test", "string:key", "double:value");' > op.txt + echo '.tables' >> op.txt + echo "[cpu]" > dosbox.conf + echo "cycles=12000" >> dosbox.conf + echo "[autoexec]" >> dosbox.conf + echo "mount c: ." >> dosbox.conf + echo "c:" >> dosbox.conf + echo "copy Client\*$(EXEC_SUFFIX) dw$(EXEC_SUFFIX)" >> dosbox.conf + echo "dw -NC -f op.txt --create db.dwf" >> dosbox.conf + echo "pause" >> dosbox.conf + echo "del db.dwf" >> dosbox.conf + echo "del dw.exe" >> dosbox.conf + echo "exit" >> dosbox.conf + if [ ! -e "dos4gw.exe" ]; then wget "https://github.com/yetmorecode/dos32a-ng/releases/download/9.1.2/DOS32ANG.EXE" -O dos4gw.exe ; fi + dosbox + rm op.txt dosbox.conf -- 2.43.0