diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-24 19:42:58 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-24 19:42:58 +0000 |
| commit | 95f3fb45ae2f4fe199e34f35be1e46b3a598ca1a (patch) | |
| tree | ab41d30b808310a07e66be3ca0bb18f28bd5d0d4 /indra/lscript | |
| parent | 8af68c8771077518585cf332ba0e1e53f18c76c7 (diff) | |
Cherry-picked windows build fixes from sunshine-experimental
Diffstat (limited to 'indra/lscript')
| -rw-r--r-- | indra/lscript/lscript_compile/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/lscript/lscript_compile/bison.bat | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/indra/lscript/lscript_compile/CMakeLists.txt b/indra/lscript/lscript_compile/CMakeLists.txt index 134703eed3..2cfd389893 100644 --- a/indra/lscript/lscript_compile/CMakeLists.txt +++ b/indra/lscript/lscript_compile/CMakeLists.txt @@ -113,8 +113,10 @@ if (WINDOWS) ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp ${CMAKE_CURRENT_BINARY_DIR}/indra.y.hpp COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bison.bat + ARGS ${BISON} ${M4_PATH} - ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp + -p indra_ + -d -o ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp ${CMAKE_CURRENT_SOURCE_DIR}/indra.y DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bison.bat diff --git a/indra/lscript/lscript_compile/bison.bat b/indra/lscript/lscript_compile/bison.bat index 0baff4e5ef..d40997225e 100644 --- a/indra/lscript/lscript_compile/bison.bat +++ b/indra/lscript/lscript_compile/bison.bat @@ -2,10 +2,11 @@ @REM find m4, even if neither program is present in PATH.
@set bison=%1
-set M4PATH=%2
+shift
+set M4PATH=%1
+shift
set M4=
-@set output=%3
-@set input=%4
set PATH=%M4PATH%;%PATH%
-%bison% -d -o %output% %input%
+@REM %* does not work with shift...
+%bison% %1 %2 %3 %4 %5 %6 %7 %8 %9
|