From 96f6ebfb80018f75b0cfaca2ea146e042bb33094 Mon Sep 17 00:00:00 2001 From: rlar Date: Fri, 6 Nov 2015 21:09:34 +0100 Subject: [PATCH] visualc/*.vcxproj, win_bison.exe in CustomBuild instead of PreBuildEvent --- visualc/sharedspice.vcxproj | 23 +++++------ visualc/vngspice.vcxproj | 77 +++++++++++++---------------------- visualc/vngspice_fftw.vcxproj | 53 ++++++++---------------- 3 files changed, 57 insertions(+), 96 deletions(-) diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj index 8c30c7dc8..51c48dd03 100644 --- a/visualc/sharedspice.vcxproj +++ b/visualc/sharedspice.vcxproj @@ -61,10 +61,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj @@ -104,10 +102,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj @@ -147,10 +143,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj @@ -698,6 +692,11 @@ + + invoke win_bison.exe for %(Identity) + ..\..\flex-bison\win_bison.exe --output=%(Filename).c --defines=%(Filename).h %(Identity) || exit 1 + %(Filename).c;%(Filename).h + diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj index 0743862d0..bc2f72039 100644 --- a/visualc/vngspice.vcxproj +++ b/visualc/vngspice.vcxproj @@ -200,10 +200,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj Disabled @@ -238,10 +236,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj MaxSpeed @@ -282,10 +278,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj X64 @@ -323,10 +317,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj X64 @@ -372,10 +364,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj Disabled @@ -410,10 +400,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj MaxSpeed @@ -454,10 +442,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj X64 @@ -495,10 +481,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj X64 @@ -542,10 +526,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj MaxSpeed @@ -587,10 +569,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj X64 @@ -637,10 +617,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj MaxSpeed @@ -682,10 +660,8 @@ - Recompile conf.c with actual date, invoke win_bison - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj X64 @@ -1237,6 +1213,11 @@ + + invoke win_bison.exe for %(Identity) + ..\..\flex-bison\win_bison.exe --output=%(Filename).c --defines=%(Filename).h %(Identity) || exit 1 + %(Filename).c;%(Filename).h + diff --git a/visualc/vngspice_fftw.vcxproj b/visualc/vngspice_fftw.vcxproj index b2dff2e96..8aa8b6c43 100644 --- a/visualc/vngspice_fftw.vcxproj +++ b/visualc/vngspice_fftw.vcxproj @@ -200,10 +200,8 @@ - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib @@ -243,10 +241,8 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib @@ -292,10 +288,8 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib @@ -338,10 +332,8 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib @@ -392,10 +384,8 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib @@ -435,10 +425,8 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib @@ -484,10 +472,8 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib @@ -530,10 +516,8 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib @@ -582,10 +566,8 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib @@ -632,10 +614,8 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib @@ -687,10 +667,8 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib @@ -737,10 +715,8 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. - Recompile conf.c with actual date, invoke win_bison + force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -..\..\flex-bison\win_bison.exe --output=inpptree-parser.c --defines=inpptree-parser.h ..\src\spicelib\parser\inpptree-parser.y || exit 1 -..\..\flex-bison\win_bison.exe --output=parse-bison.c --defines=parse-bison.h ..\src\frontend\parse-bison.y || exit 1 lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib @@ -1297,6 +1273,11 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. + + invoke win_bison.exe for %(Identity) + ..\..\flex-bison\win_bison.exe --output=%(Filename).c --defines=%(Filename).h %(Identity) || exit 1 + %(Filename).c;%(Filename).h +