From 978e2989ca8b0106cc3ca18faed89df098b0a44a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 30 Oct 2019 15:26:02 +0800 Subject: [PATCH] NMake: Fix building test programs Define PSL_DAFSA and PSL_ASCII_DAFSA to point to the corresponding DAFSA files that we generated during the build. --- msvc/config-msvc.mak.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/msvc/config-msvc.mak.in b/msvc/config-msvc.mak.in index adf1eff..ed24cb4 100644 --- a/msvc/config-msvc.mak.in +++ b/msvc/config-msvc.mak.in @@ -128,7 +128,12 @@ BASE_CFLAGS = $(BASE_CFLAGS) /DUSE_ICONV=1 PSL_MAKE_OPTIONS = $(PSL_MAKE_OPTIONS) USE_ICONV^=1 !endif -PSL_TEST_CFLAGS = $(BASE_CFLAGS) /DPSL_TESTFILE=\"$(PSL_TESTFILE_INPUT)\" /DPSL_FILE=\"$(PSL_FILE_INPUT)\" +PSL_TEST_CFLAGS = \ + $(BASE_CFLAGS) \ + /DPSL_TESTFILE=\"$(PSL_TESTFILE_INPUT)\" \ + /DPSL_FILE=\"$(PSL_FILE_INPUT)\" \ + /DPSL_DAFSA=\"$(MAKEDIR:\=/)/$(CFG)/$(PLAT)/psl.dafsa\" \ + /DPSL_ASCII_DAFSA=\"$(MAKEDIR:\=/)/$(CFG)/$(PLAT)/psl_ascii.dafsa\" # Visual Studio 2013 or earlier does not have snprintf(), # so use _snprintf() which seems to be enough for our purposes