diff options
| author | developer@Developer-PC <developer@Developer-PC> | 2012-09-21 22:21:42 -0700 |
|---|---|---|
| committer | developer@Developer-PC <developer@Developer-PC> | 2012-09-21 22:21:42 -0700 |
| commit | ecf72da021d16168688a833e776e8a76e80ee4d6 (patch) | |
| tree | c61de5560a008cba335d41e567fb48fade638361 /indra/lscript/lscript_compile | |
| parent | 2d36f9b98a95a384f712c711bf9fc4cbe53780aa (diff) | |
More windows build fixes
Diffstat (limited to 'indra/lscript/lscript_compile')
| -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..13cbd3ffd2 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
|