Changeset 1815
- Timestamp:
- Sep 21, 2008, 10:42:09 PM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 7 edited
-
src/core/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/CMakeLists.txt (modified) (1 diff)
-
src/tolua/CMakeLists.txt (modified) (1 diff)
-
visual_studio/base_properties.vsprops (modified) (1 diff)
-
visual_studio/vc8/core.vcproj (modified) (1 diff)
-
visual_studio/vc8/lua.vcproj (modified) (2 diffs)
-
visual_studio/vc8/tolua_app.vcproj (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/core/CMakeLists.txt
r1813 r1815 58 58 OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc 59 59 COMMAND ${TOLUA_EXE} -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg 60 DEPENDS tolua_orxonox tolua/tolua.pkg 60 DEPENDS 61 tolua_orxonox 62 tolua/tolua.pkg 63 Script.h 64 CommandExecutor.h 61 65 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib 62 66 ) -
code/trunk/src/orxonox/CMakeLists.txt
r1813 r1815 70 70 OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc 71 71 COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg 72 DEPENDS tolua_orxonox tolua/tolua.pkg 72 DEPENDS 73 tolua_orxonox 74 tolua/tolua.pkg 75 gui/GUIManager.h 73 76 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib 74 77 ) -
code/trunk/src/tolua/CMakeLists.txt
r1813 r1815 35 35 DEPENDS 36 36 toluagen_orxonox 37 37 tolua-5.1.pkg 38 38 lua/compat-5.1.lua 39 39 lua/compat.lua -
code/trunk/visual_studio/base_properties.vsprops
r1810 r1815 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 AdditionalIncludeDirectories=""$(RootDir)";"$(RootDir)src";"$(RootDir)src\orxonox";"$(RootDir)src\ lua-5.1.3";"$(RootDir)src\ceguilua-0.6.1";"$(LibDir)ogre-1.4.9\OgreMain\include";"$(LibDir)boost-1.35.0";"$(LibDir)cegui-0.6.1\include";"$(LibDir)enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)openal-1.1\include";"$(LibDir)openal-1.1\alut\include";"$(LibDir)tcl-8.5.\generic";"$(LibDir)zlib-1.2.3""10 AdditionalIncludeDirectories=""$(RootDir)";"$(RootDir)src";"$(RootDir)src\orxonox";"$(RootDir)src\ceguilua-0.6.1";"$(LibDir)ogre-1.4.9\OgreMain\include";"$(LibDir)boost-1.35.0";"$(LibDir)cegui-0.6.1\include";"$(LibDir)enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)openal-1.1\include";"$(LibDir)openal-1.1\alut\include";"$(LibDir)tcl-8.5.\generic";"$(LibDir)zlib-1.2.3"" 11 11 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI;LUA_BUILD_AS_DLL" 12 12 WarningLevel="3" -
code/trunk/visual_studio/vc8/core.vcproj
r1810 r1815 197 197 Description="Generating tolua bind files..." 198 198 CommandLine=""$(OutDir)\tolua_app_d.exe" -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
" 199 AdditionalDependencies="$(RootDir)\src\core\Script.h; 199 AdditionalDependencies="$(RootDir)\src\core\Script.h;$(RootDir)\src\core\CommandExecutor.h" 200 200 Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h" 201 201 /> -
code/trunk/visual_studio/vc8/lua.vcproj
r1810 r1815 149 149 > 150 150 <File 151 RelativePath="..\..\src\lua -5.1.3\lua\lapi.c"152 > 153 </File> 154 <File 155 RelativePath="..\..\src\lua -5.1.3\lua\lauxlib.c"156 > 157 </File> 158 <File 159 RelativePath="..\..\src\lua -5.1.3\lua\lbaselib.c"160 > 161 </File> 162 <File 163 RelativePath="..\..\src\lua -5.1.3\lua\lcode.c"164 > 165 </File> 166 <File 167 RelativePath="..\..\src\lua -5.1.3\lua\ldblib.c"168 > 169 </File> 170 <File 171 RelativePath="..\..\src\lua -5.1.3\lua\ldebug.c"172 > 173 </File> 174 <File 175 RelativePath="..\..\src\lua -5.1.3\lua\ldo.c"176 > 177 </File> 178 <File 179 RelativePath="..\..\src\lua -5.1.3\lua\ldump.c"180 > 181 </File> 182 <File 183 RelativePath="..\..\src\lua -5.1.3\lua\lfunc.c"184 > 185 </File> 186 <File 187 RelativePath="..\..\src\lua -5.1.3\lua\lgc.c"188 > 189 </File> 190 <File 191 RelativePath="..\..\src\lua -5.1.3\lua\linit.c"192 > 193 </File> 194 <File 195 RelativePath="..\..\src\lua -5.1.3\lua\liolib.c"196 > 197 </File> 198 <File 199 RelativePath="..\..\src\lua -5.1.3\lua\llex.c"200 > 201 </File> 202 <File 203 RelativePath="..\..\src\lua -5.1.3\lua\lmathlib.c"204 > 205 </File> 206 <File 207 RelativePath="..\..\src\lua -5.1.3\lua\lmem.c"208 > 209 </File> 210 <File 211 RelativePath="..\..\src\lua -5.1.3\lua\loadlib.c"212 > 213 </File> 214 <File 215 RelativePath="..\..\src\lua -5.1.3\lua\lobject.c"216 > 217 </File> 218 <File 219 RelativePath="..\..\src\lua -5.1.3\lua\lopcodes.c"220 > 221 </File> 222 <File 223 RelativePath="..\..\src\lua -5.1.3\lua\loslib.c"224 > 225 </File> 226 <File 227 RelativePath="..\..\src\lua -5.1.3\lua\lparser.c"228 > 229 </File> 230 <File 231 RelativePath="..\..\src\lua -5.1.3\lua\lstate.c"232 > 233 </File> 234 <File 235 RelativePath="..\..\src\lua -5.1.3\lua\lstring.c"236 > 237 </File> 238 <File 239 RelativePath="..\..\src\lua -5.1.3\lua\lstrlib.c"240 > 241 </File> 242 <File 243 RelativePath="..\..\src\lua -5.1.3\lua\ltable.c"244 > 245 </File> 246 <File 247 RelativePath="..\..\src\lua -5.1.3\lua\ltablib.c"248 > 249 </File> 250 <File 251 RelativePath="..\..\src\lua -5.1.3\lua\ltm.c"252 > 253 </File> 254 <File 255 RelativePath="..\..\src\lua -5.1.3\lua\lundump.c"256 > 257 </File> 258 <File 259 RelativePath="..\..\src\lua -5.1.3\lua\lvm.c"260 > 261 </File> 262 <File 263 RelativePath="..\..\src\lua -5.1.3\lua\lzio.c"151 RelativePath="..\..\src\lua\lapi.c" 152 > 153 </File> 154 <File 155 RelativePath="..\..\src\lua\lauxlib.c" 156 > 157 </File> 158 <File 159 RelativePath="..\..\src\lua\lbaselib.c" 160 > 161 </File> 162 <File 163 RelativePath="..\..\src\lua\lcode.c" 164 > 165 </File> 166 <File 167 RelativePath="..\..\src\lua\ldblib.c" 168 > 169 </File> 170 <File 171 RelativePath="..\..\src\lua\ldebug.c" 172 > 173 </File> 174 <File 175 RelativePath="..\..\src\lua\ldo.c" 176 > 177 </File> 178 <File 179 RelativePath="..\..\src\lua\ldump.c" 180 > 181 </File> 182 <File 183 RelativePath="..\..\src\lua\lfunc.c" 184 > 185 </File> 186 <File 187 RelativePath="..\..\src\lua\lgc.c" 188 > 189 </File> 190 <File 191 RelativePath="..\..\src\lua\linit.c" 192 > 193 </File> 194 <File 195 RelativePath="..\..\src\lua\liolib.c" 196 > 197 </File> 198 <File 199 RelativePath="..\..\src\lua\llex.c" 200 > 201 </File> 202 <File 203 RelativePath="..\..\src\lua\lmathlib.c" 204 > 205 </File> 206 <File 207 RelativePath="..\..\src\lua\lmem.c" 208 > 209 </File> 210 <File 211 RelativePath="..\..\src\lua\loadlib.c" 212 > 213 </File> 214 <File 215 RelativePath="..\..\src\lua\lobject.c" 216 > 217 </File> 218 <File 219 RelativePath="..\..\src\lua\lopcodes.c" 220 > 221 </File> 222 <File 223 RelativePath="..\..\src\lua\loslib.c" 224 > 225 </File> 226 <File 227 RelativePath="..\..\src\lua\lparser.c" 228 > 229 </File> 230 <File 231 RelativePath="..\..\src\lua\lstate.c" 232 > 233 </File> 234 <File 235 RelativePath="..\..\src\lua\lstring.c" 236 > 237 </File> 238 <File 239 RelativePath="..\..\src\lua\lstrlib.c" 240 > 241 </File> 242 <File 243 RelativePath="..\..\src\lua\ltable.c" 244 > 245 </File> 246 <File 247 RelativePath="..\..\src\lua\ltablib.c" 248 > 249 </File> 250 <File 251 RelativePath="..\..\src\lua\ltm.c" 252 > 253 </File> 254 <File 255 RelativePath="..\..\src\lua\lundump.c" 256 > 257 </File> 258 <File 259 RelativePath="..\..\src\lua\lvm.c" 260 > 261 </File> 262 <File 263 RelativePath="..\..\src\lua\lzio.c" 264 264 > 265 265 </File> … … 271 271 > 272 272 <File 273 RelativePath="..\..\src\lua -5.1.3\lua\lapi.h"274 > 275 </File> 276 <File 277 RelativePath="..\..\src\lua -5.1.3\lua\lauxlib.h"278 > 279 </File> 280 <File 281 RelativePath="..\..\src\lua -5.1.3\lua\lcode.h"282 > 283 </File> 284 <File 285 RelativePath="..\..\src\lua -5.1.3\lua\ldebug.h"286 > 287 </File> 288 <File 289 RelativePath="..\..\src\lua -5.1.3\lua\ldo.h"290 > 291 </File> 292 <File 293 RelativePath="..\..\src\lua -5.1.3\lua\lfunc.h"294 > 295 </File> 296 <File 297 RelativePath="..\..\src\lua -5.1.3\lua\lgc.h"298 > 299 </File> 300 <File 301 RelativePath="..\..\src\lua -5.1.3\lua\llex.h"302 > 303 </File> 304 <File 305 RelativePath="..\..\src\lua -5.1.3\lua\llimits.h"306 > 307 </File> 308 <File 309 RelativePath="..\..\src\lua -5.1.3\lua\lmem.h"310 > 311 </File> 312 <File 313 RelativePath="..\..\src\lua -5.1.3\lua\lobject.h"314 > 315 </File> 316 <File 317 RelativePath="..\..\src\lua -5.1.3\lua\lopcodes.h"318 > 319 </File> 320 <File 321 RelativePath="..\..\src\lua -5.1.3\lua\lparser.h"322 > 323 </File> 324 <File 325 RelativePath="..\..\src\lua -5.1.3\lua\lstate.h"326 > 327 </File> 328 <File 329 RelativePath="..\..\src\lua -5.1.3\lua\lstring.h"330 > 331 </File> 332 <File 333 RelativePath="..\..\src\lua -5.1.3\lua\ltable.h"334 > 335 </File> 336 <File 337 RelativePath="..\..\src\lua -5.1.3\lua\ltm.h"338 > 339 </File> 340 <File 341 RelativePath="..\..\src\lua -5.1.3\lua\lua.h"342 > 343 </File> 344 <File 345 RelativePath="..\..\src\lua -5.1.3\lua\lua.hpp"346 > 347 </File> 348 <File 349 RelativePath="..\..\src\lua -5.1.3\lua\luaconf.h"350 > 351 </File> 352 <File 353 RelativePath="..\..\src\lua -5.1.3\lua\lualib.h"354 > 355 </File> 356 <File 357 RelativePath="..\..\src\lua -5.1.3\lua\lundump.h"358 > 359 </File> 360 <File 361 RelativePath="..\..\src\lua -5.1.3\lua\lvm.h"362 > 363 </File> 364 <File 365 RelativePath="..\..\src\lua -5.1.3\lua\lzio.h"273 RelativePath="..\..\src\lua\lapi.h" 274 > 275 </File> 276 <File 277 RelativePath="..\..\src\lua\lauxlib.h" 278 > 279 </File> 280 <File 281 RelativePath="..\..\src\lua\lcode.h" 282 > 283 </File> 284 <File 285 RelativePath="..\..\src\lua\ldebug.h" 286 > 287 </File> 288 <File 289 RelativePath="..\..\src\lua\ldo.h" 290 > 291 </File> 292 <File 293 RelativePath="..\..\src\lua\lfunc.h" 294 > 295 </File> 296 <File 297 RelativePath="..\..\src\lua\lgc.h" 298 > 299 </File> 300 <File 301 RelativePath="..\..\src\lua\llex.h" 302 > 303 </File> 304 <File 305 RelativePath="..\..\src\lua\llimits.h" 306 > 307 </File> 308 <File 309 RelativePath="..\..\src\lua\lmem.h" 310 > 311 </File> 312 <File 313 RelativePath="..\..\src\lua\lobject.h" 314 > 315 </File> 316 <File 317 RelativePath="..\..\src\lua\lopcodes.h" 318 > 319 </File> 320 <File 321 RelativePath="..\..\src\lua\lparser.h" 322 > 323 </File> 324 <File 325 RelativePath="..\..\src\lua\lstate.h" 326 > 327 </File> 328 <File 329 RelativePath="..\..\src\lua\lstring.h" 330 > 331 </File> 332 <File 333 RelativePath="..\..\src\lua\ltable.h" 334 > 335 </File> 336 <File 337 RelativePath="..\..\src\lua\ltm.h" 338 > 339 </File> 340 <File 341 RelativePath="..\..\src\lua\lua.h" 342 > 343 </File> 344 <File 345 RelativePath="..\..\src\lua\lua.hpp" 346 > 347 </File> 348 <File 349 RelativePath="..\..\src\lua\luaconf.h" 350 > 351 </File> 352 <File 353 RelativePath="..\..\src\lua\lualib.h" 354 > 355 </File> 356 <File 357 RelativePath="..\..\src\lua\lundump.h" 358 > 359 </File> 360 <File 361 RelativePath="..\..\src\lua\lvm.h" 362 > 363 </File> 364 <File 365 RelativePath="..\..\src\lua\lzio.h" 366 366 > 367 367 </File> -
code/trunk/visual_studio/vc8/tolua_app.vcproj
r1755 r1815 149 149 > 150 150 <File 151 RelativePath="..\..\src\tolua\tolua.c"152 >153 </File>154 <File155 151 RelativePath="..\..\src\tolua\tolua-5.1.pkg" 156 152 > … … 162 158 Description="Generating tolua bind files..." 163 159 CommandLine=""$(OutDir)\tolua_gen_d.exe" -n tolua -o ../../src/tolua/toluabind_orxonox.c -H ../../src/tolua/toluabind_orxonox.h ../../src/tolua/tolua-5.1.pkg
" 160 AdditionalDependencies="$(RootDir)\src\tolua\lua\compat-5.1.lua;$(RootDir)\src\tolua\lua\compat.lua;$(RootDir)\src\tolua\lua\basic.lua;$(RootDir)\src\tolua\lua\feature.lua;$(RootDir)\src\tolua\lua\verbatim.lua;$(RootDir)\src\tolua\lua\code.lua;$(RootDir)\src\tolua\lua\typedef.lua;$(RootDir)\src\tolua\lua\container.lua;$(RootDir)\src\tolua\lua\package.lua;$(RootDir)\src\tolua\lua\module.lua;$(RootDir)\src\tolua\lua\namespace.lua;$(RootDir)\src\tolua\lua\define.lua;$(RootDir)\src\tolua\lua\enumerate.lua;$(RootDir)\src\tolua\lua\declaration.lua;$(RootDir)\src\tolua\lua\variable.lua;$(RootDir)\src\tolua\lua\array.lua;$(RootDir)\src\tolua\lua\function.lua;$(RootDir)\src\tolua\lua\operator.lua;$(RootDir)\src\tolua\lua\class.lua;$(RootDir)\src\tolua\lua\clean.lua;$(RootDir)\src\tolua\lua\doit.lua" 164 161 Outputs="$(RootDir)\src\tolua\toluabind_orxonox.c; $(RootDir)\src\tolua\toluabind_orxonox.h" 165 162 /> … … 172 169 Description="Generating tolua bind files..." 173 170 CommandLine=""$(OutDir)\tolua_gen.exe" -n tolua -o ../../src/tolua/toluabind_orxonox.c -H ../../src/tolua/toluabind_orxonox.h ../../src/tolua/tolua-5.1.pkg
" 171 AdditionalDependencies="$(RootDir)\src\tolua\lua\compat-5.1.lua;$(RootDir)\src\tolua\lua\compat.lua;$(RootDir)\src\tolua\lua\basic.lua;$(RootDir)\src\tolua\lua\feature.lua;$(RootDir)\src\tolua\lua\verbatim.lua;$(RootDir)\src\tolua\lua\code.lua;$(RootDir)\src\tolua\lua\typedef.lua;$(RootDir)\src\tolua\lua\container.lua;$(RootDir)\src\tolua\lua\package.lua;$(RootDir)\src\tolua\lua\module.lua;$(RootDir)\src\tolua\lua\namespace.lua;$(RootDir)\src\tolua\lua\define.lua;$(RootDir)\src\tolua\lua\enumerate.lua;$(RootDir)\src\tolua\lua\declaration.lua;$(RootDir)\src\tolua\lua\variable.lua;$(RootDir)\src\tolua\lua\array.lua;$(RootDir)\src\tolua\lua\function.lua;$(RootDir)\src\tolua\lua\operator.lua;$(RootDir)\src\tolua\lua\class.lua;$(RootDir)\src\tolua\lua\clean.lua;$(RootDir)\src\tolua\lua\doit.lua" 174 172 Outputs="$(RootDir)\src\tolua\toluabind_orxonox.c; $(RootDir)\src\tolua\toluabind_orxonox.h" 175 173 /> 176 174 </FileConfiguration> 175 </File> 176 <File 177 RelativePath="..\..\src\tolua\tolua.c" 178 > 177 179 </File> 178 180 <File
Note: See TracChangeset
for help on using the changeset viewer.
