Changeset 2233 for code/branches/buildsystem
- Timestamp:
- Nov 19, 2008, 8:39:40 PM (16 years ago)
- Location:
- code/branches/buildsystem
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/buildsystem/cmake/UseTolua.cmake
r1978 r2233 44 44 ADD_CUSTOM_COMMAND( 45 45 OUTPUT "${_tolua_cxxfile}" "${_tolua_hfile}" 46 COMMAND "${TOLUA_EXECUTABLE}" -n "${_tolua_package}" - o "${_tolua_cxxfile}" -H "${_tolua_hfile}" "${_tolua_pkgfile}"46 COMMAND "${TOLUA_EXECUTABLE}" -n "${_tolua_package}" -w ${CMAKE_CURRENT_SOURCE_DIR} -o "${_tolua_cxxfile}" -H "${_tolua_hfile}" "${_tolua_pkgfile}" 47 47 DEPENDS "${_tolua_executable_name}" ${_tolua_inputfiles} 48 48 WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" -
code/branches/buildsystem/src/tolua/CMakeLists.txt
r1975 r2233 24 24 ADD_CUSTOM_COMMAND( 25 25 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.c 26 COMMAND ${TOLUAGEN_EXE} -n tolua - o ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.c -H ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.h ${TOLUA_PACKAGE}26 COMMAND ${TOLUAGEN_EXE} -n tolua -w ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.c -H ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.h ${TOLUA_PACKAGE} 27 27 DEPENDS 28 28 toluagen_orxonox -
code/branches/buildsystem/src/tolua/lua/package.lua
r2229 r2233 277 277 end 278 278 279 -- prepare working directory 280 local current_path 281 if not flags.w and flags.f then 282 current_path = gsub(flags.f, '(/)[^/]*%.?[^/]*$', '%1') 283 elseif flags.w then 284 if not (string.sub(flags.w, string.len(flags.w)) == '/') then 285 current_path = flags.w..'/' 286 else 287 current_path = flags.w 288 end 289 else 290 current_path = '' 291 end 292 279 293 -- deal with include directive 280 294 local nsubst … … 283 297 function (kind,fn,extra) 284 298 local _, _, ext = strfind(fn,".*%.(.*)$") 285 local fp,msg = openfile( fn,'r')299 local fp,msg = openfile(current_path..fn,'r') 286 300 if not fp then 287 301 error('#'..msg..': '..fn) -
code/branches/buildsystem/src/tolua/tolua.c
r1975 r2233 34 34 " -H file : create include file.\n" 35 35 " -n name : set package name; default is input file root name.\n" 36 " -w folder : set working directory; efault is location of package file.\n" 36 37 " -p : parse only.\n" 37 38 " -P : parse and print structure information (for debug).\n" … … 125 126 case 'n': setfield(L,t,"n",argv[++i]); break; 126 127 case 'H': setfield(L,t,"H",argv[++i]); break; 128 case 'w': setfield(L,t,"w",argv[++i]); break; 127 129 case 'S': setfield(L,t,"S",""); break; 128 130 case '1': setfield(L,t,"1",""); break;
Note: See TracChangeset
for help on using the changeset viewer.