Previous 199869 Revisions Next

r36725 Saturday 28th March, 2015 at 05:06:06 UTC by Vasantha Crabb
build into OSD subdirectory for people building multiple OSDs
[scripts]genie.lua toolchain.lua
[scripts/src/osd]sdl.lua

trunk/scripts/genie.lua
r245236r245237
588588   subdir = _OPTIONS["osd"] .. "/" .. _OPTIONS["target"] .. _OPTIONS["subtarget"]
589589end   
590590
591if not toolchain(MAME_BUILD_DIR, subdir) then
591if not toolchain(_OPTIONS["osd"], MAME_BUILD_DIR, subdir) then
592592   return -- no action specified
593593end
594594   
trunk/scripts/src/osd/sdl.lua
r245236r245237
2525         "oleaut32",
2626      }
2727
28configuration { }
2829
30
2931project ("osd_" .. _OPTIONS["osd"])
3032   uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
3133   kind "StaticLib"
trunk/scripts/toolchain.lua
r245236r245237
6060   description = "Set iOS target version (default: 8.0).",
6161}
6262
63function toolchain(_buildDir, _subDir)
63function toolchain(_osd, _buildDir, _subDir)
6464
6565   location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION)
6666
r245236r245237
352352
353353
354354   configuration { "x32", "vs*" }
355      targetdir (_buildDir .. "win32_" .. _ACTION .. "/bin")
356      objdir (_buildDir .. "win32_" .. _ACTION .. "/obj")
355      targetdir (_buildDir .. _osd .. "/win32_" .. _ACTION .. "/bin")
356      objdir (_buildDir .. _osd .. "/win32_" .. _ACTION .. "/obj")
357357
358358   configuration { "x64", "vs*" }
359359      defines { "_WIN64" }
360      targetdir (_buildDir .. "win64_" .. _ACTION .. "/bin")
361      objdir (_buildDir .. "win64_" .. _ACTION .. "/obj")
360      targetdir (_buildDir .. _osd .. "/win64_" .. _ACTION .. "/bin")
361      objdir (_buildDir .. _osd .. "/win64_" .. _ACTION .. "/obj")
362362
363363   configuration { "ARM", "vs*" }
364      targetdir (_buildDir .. "arm_" .. _ACTION .. "/bin")
365      objdir (_buildDir .. "arm_" .. _ACTION .. "/obj")
364      targetdir (_buildDir .. _osd .. "/arm_" .. _ACTION .. "/bin")
365      objdir (_buildDir .. _osd .. "/arm_" .. _ACTION .. "/obj")
366366
367367   configuration { "x32", "vs*-clang" }
368      targetdir (_buildDir .. "win32_" .. _ACTION .. "-clang/bin")
369      objdir (_buildDir .. "win32_" .. _ACTION .. "-clang/obj")
368      targetdir (_buildDir .. _osd .. "/win32_" .. _ACTION .. "-clang/bin")
369      objdir (_buildDir .. _osd .. "/win32_" .. _ACTION .. "-clang/obj")
370370
371371   configuration { "x64", "vs*-clang" }
372      targetdir (_buildDir .. "win64_" .. _ACTION .. "-clang/bin")
373      objdir (_buildDir .. "win64_" .. _ACTION .. "-clang/obj")
372      targetdir (_buildDir .. _osd .. "/win64_" .. _ACTION .. "-clang/bin")
373      objdir (_buildDir .. _osd .. "/win64_" .. _ACTION .. "-clang/obj")
374374
375375   configuration { "mingw*" }
376376      defines { "WIN32" }
377377
378378   configuration { "x32", "mingw32-gcc" }
379      targetdir (_buildDir .. "win32_mingw-gcc" .. "/bin")
380      objdir (_buildDir .. "win32_mingw-gcc" .. "/obj")
379      targetdir (_buildDir .. _osd .. "/win32_mingw-gcc" .. "/bin")
380      objdir (_buildDir .. _osd .. "/win32_mingw-gcc" .. "/obj")
381381      buildoptions { "-m32" }
382382
383383   configuration { "x64", "mingw64-gcc" }
384      targetdir (_buildDir .. "win64_mingw-gcc" .. "/bin")
385      objdir (_buildDir .. "win64_mingw-gcc" .. "/obj")
384      targetdir (_buildDir .. _osd .. "/win64_mingw-gcc" .. "/bin")
385      objdir (_buildDir .. _osd .. "/win64_mingw-gcc" .. "/obj")
386386      buildoptions { "-m64" }
387387     
388388   configuration { "mingw-clang" }
r245236r245237
392392      }
393393
394394   configuration { "x32", "mingw-clang" }
395      targetdir (_buildDir .. "win32_mingw-clang/bin")
396      objdir ( _buildDir .. "win32_mingw-clang/obj")
395      targetdir (_buildDir .. _osd .. "/win32_mingw-clang/bin")
396      objdir ( _buildDir .. _osd .. "/win32_mingw-clang/obj")
397397      buildoptions { "-m32" }
398398      buildoptions {
399399         "-isystem$(MINGW32)/i686-w64-mingw32/include/c++",
r245236r245237
402402      }
403403     
404404   configuration { "x64", "mingw-clang" }
405      targetdir (_buildDir .. "win64_mingw-clang/bin")
406      objdir (_buildDir .. "win64_mingw-clang/obj")
405      targetdir (_buildDir .. _osd .. "/win64_mingw-clang/bin")
406      objdir (_buildDir .. _osd .. "/win64_mingw-clang/obj")
407407      buildoptions { "-m64" }
408408      buildoptions {
409409         "-isystem$(MINGW64)/x86_64-w64-mingw32/include/c++",
r245236r245237
412412      }     
413413
414414   configuration { "linux-gcc", "x32" }
415      targetdir (_buildDir .. "linux32_gcc" .. "/bin")
416      objdir (_buildDir .. "linux32_gcc" .. "/obj")
415      targetdir (_buildDir .. _osd .. "/linux32_gcc" .. "/bin")
416      objdir (_buildDir .. _osd .. "/linux32_gcc" .. "/obj")
417417      buildoptions {
418418         "-m32",
419419      }
420420
421421   configuration { "linux-gcc", "x64" }
422      targetdir (_buildDir .. "linux64_gcc" .. "/bin")
423      objdir (_buildDir .. "linux64_gcc" .. "/obj")
422      targetdir (_buildDir .. _osd .. "/linux64_gcc" .. "/bin")
423      objdir (_buildDir .. _osd .. "/linux64_gcc" .. "/obj")
424424      buildoptions {
425425         "-m64",
426426      }
427427
428428   configuration { "linux-clang", "x32" }
429      targetdir (_buildDir .. "linux32_clang" .. "/bin")
430      objdir (_buildDir .. "linux32_clang" .. "/obj")
429      targetdir (_buildDir .. _osd .. "/linux32_clang" .. "/bin")
430      objdir (_buildDir .. _osd .. "/linux32_clang" .. "/obj")
431431      buildoptions {
432432         "-m32",
433433      }
434434
435435   configuration { "linux-clang", "x64" }
436      targetdir (_buildDir .. "linux64_clang" .. "/bin")
437      objdir (_buildDir .. "linux64_clang" .. "/obj")
436      targetdir (_buildDir .. _osd .. "/linux64_clang" .. "/bin")
437      objdir (_buildDir .. _osd .. "/linux64_clang" .. "/obj")
438438      buildoptions {
439439         "-m64",
440440      }
r245236r245237
481481
482482
483483   configuration { "android-arm" }
484      targetdir (_buildDir .. "android-arm" .. "/bin")
485      objdir (_buildDir .. "android-arm" .. "/obj")
484      targetdir (_buildDir .. _osd .. "/android-arm" .. "/bin")
485      objdir (_buildDir .. _osd .. "/android-arm" .. "/obj")
486486         libdirs {
487487            "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a",
488488         }
r245236r245237
507507         }
508508
509509   configuration { "android-mips" }
510      targetdir (_buildDir .. "android-mips" .. "/bin")
511      objdir (_buildDir .. "android-mips" .. "/obj")
510      targetdir (_buildDir .. _osd .. "/android-mips" .. "/bin")
511      objdir (_buildDir .. _osd .. "/android-mips" .. "/obj")
512512      libdirs {
513513         "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips",
514514      }
r245236r245237
527527      }
528528
529529   configuration { "android-x86" }
530      targetdir (_buildDir .. "android-x86" .. "/bin")
531      objdir (_buildDir .. "android-x86" .. "/obj")
530      targetdir (_buildDir .. _osd .. "/android-x86" .. "/bin")
531      objdir (_buildDir .. _osd .. "/android-x86" .. "/obj")
532532      libdirs {
533533         "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86",
534534      }
r245236r245237
553553
554554
555555   configuration { "asmjs" }
556      targetdir (_buildDir .. "asmjs" .. "/bin")
557      objdir (_buildDir .. "asmjs" .. "/obj")
556      targetdir (_buildDir .. _osd .. "/asmjs" .. "/bin")
557      objdir (_buildDir .. _osd .. "/asmjs" .. "/obj")
558558      buildoptions {
559559         "-isystem$(EMSCRIPTEN)/system/include",
560560         "-isystem$(EMSCRIPTEN)/system/include/compat",
r245236r245237
571571      }
572572
573573   configuration { "freebsd" }
574      targetdir (_buildDir .. "freebsd" .. "/bin")
575      objdir (_buildDir .. "freebsd" .. "/obj")
574      targetdir (_buildDir .. _osd .. "/freebsd" .. "/bin")
575      objdir (_buildDir .. _osd .. "/freebsd" .. "/obj")
576576
577577   configuration { "nacl or nacl-arm or pnacl" }
578578      buildoptions {
r245236r245237
600600      }
601601
602602   configuration { "x32", "nacl" }
603      targetdir (_buildDir .. "nacl-x86" .. "/bin")
604      objdir (_buildDir .. "nacl-x86" .. "/obj")
603      targetdir (_buildDir .. _osd .. "/nacl-x86" .. "/bin")
604      objdir (_buildDir .. _osd .. "/nacl-x86" .. "/obj")
605605
606606   configuration { "x32", "nacl", "Debug" }
607607      libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Debug" }
r245236r245237
610610      libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Release" }
611611
612612   configuration { "x64", "nacl" }
613      targetdir (_buildDir .. "nacl-x64" .. "/bin")
614      objdir (_buildDir .. "nacl-x64" .. "/obj")
613      targetdir (_buildDir .. _osd .. "/nacl-x64" .. "/bin")
614      objdir (_buildDir .. _osd .. "/nacl-x64" .. "/obj")
615615
616616   configuration { "x64", "nacl", "Debug" }
617617      libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Debug" }
r245236r245237
620620      libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Release" }
621621
622622   configuration { "nacl-arm" }
623      targetdir (_buildDir .. "nacl-arm" .. "/bin")
624      objdir (_buildDir .. "nacl-arm" .. "/obj")
623      targetdir (_buildDir .. _osd .. "/nacl-arm" .. "/bin")
624      objdir (_buildDir .. _osd .. "/nacl-arm" .. "/obj")
625625
626626   configuration { "nacl-arm", "Debug" }
627627      libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Debug" }
r245236r245237
630630      libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Release" }
631631
632632   configuration { "pnacl" }
633      targetdir (_buildDir .. "pnacl" .. "/bin")
634      objdir (_buildDir .. "pnacl" .. "/obj")
633      targetdir (_buildDir .. _osd .. "/pnacl" .. "/bin")
634      objdir (_buildDir .. _osd .. "/pnacl" .. "/obj")
635635
636636   configuration { "pnacl", "Debug" }
637637      libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Debug" }
r245236r245237
640640      libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Release" }
641641
642642   configuration { "osx*", "x32" }
643      targetdir (_buildDir .. "osx32_clang" .. "/bin")
644      objdir (_buildDir .. "osx32_clang" .. "/obj")
643      targetdir (_buildDir .. _osd .. "/osx32_clang" .. "/bin")
644      objdir (_buildDir .. _osd .. "/osx32_clang" .. "/obj")
645645      buildoptions {
646646         "-m32",
647647      }
648648
649649   configuration { "osx*", "x64" }
650      targetdir (_buildDir .. "osx64_clang" .. "/bin")
651      objdir (_buildDir .. "osx64_clang" .. "/obj")
650      targetdir (_buildDir .. _osd .. "/osx64_clang" .. "/bin")
651      objdir (_buildDir .. _osd .. "/osx64_clang" .. "/obj")
652652      buildoptions {
653653         "-m64",
654654      }
655655
656656   configuration { "ios-arm" }
657      targetdir (_buildDir .. "ios-arm" .. "/bin")
658      objdir (_buildDir .. "ios-arm" .. "/obj")
657      targetdir (_buildDir .. _osd .. "/ios-arm" .. "/bin")
658      objdir (_buildDir .. _osd .. "/ios-arm" .. "/obj")
659659
660660   configuration { "ios-simulator" }
661      targetdir (_buildDir .. "ios-simulator" .. "/bin")
662      objdir (_buildDir .. "ios-simulator" .. "/obj")
661      targetdir (_buildDir .. _osd .. "/ios-simulator" .. "/bin")
662      objdir (_buildDir .. _osd .. "/ios-simulator" .. "/obj")
663663
664664   configuration { "qnx-arm" }
665      targetdir (_buildDir .. "qnx-arm" .. "/bin")
666      objdir (_buildDir .. "qnx-arm" .. "/obj")
665      targetdir (_buildDir .. _osd .. "/qnx-arm" .. "/bin")
666      objdir (_buildDir .. _osd .. "/qnx-arm" .. "/obj")
667667
668668   configuration { "rpi" }
669      targetdir (_buildDir .. "rpi" .. "/bin")
670      objdir (_buildDir .. "rpi" .. "/obj")
669      targetdir (_buildDir .. _osd .. "/rpi" .. "/bin")
670      objdir (_buildDir .. _osd .. "/rpi" .. "/obj")
671671
672672   configuration {} -- reset configuration
673673

https://github.com/mamedev/mame/commit/a9bc80bd4b89a14bc790f436c15ec5666f0d6f1c

Previous 199869 Revisions Next

© 1997-2024 The MAME Team