Previous 199869 Revisions Next

r36723 Saturday 28th March, 2015 at 04:09:22 UTC by Vasantha Crabb
Move more OSD-specific stuff to OSD scripts
[scripts]genie.lua
[scripts/src]main.lua
[scripts/src/osd]osdmini.lua sdl.lua windows.lua

trunk/scripts/genie.lua
r245234r245235
55local naclToolchain = ""
66
77
8function includeosd()
9   includedirs {
10      MAME_DIR .. "src/osd",
11   }
12   if _OPTIONS["osd"]=="windows" then
13      includedirs {
14         MAME_DIR .. "src/osd/windows",
15      }
16   else
17      includedirs {
18         MAME_DIR .. "src/osd/sdl",
19      }
20   end
21end
22
238function str_to_version (str)
249   local val = 0
2510   if (str == nil or str == '') then
r245234r245235
277262dofile ("toolchain.lua")
278263
279264
280if _OPTIONS["osd"]=="windows" then
281   forcedincludes {
282      MAME_DIR .. "src/osd/windows/winprefix.h"
283   }
284elseif _OPTIONS["osd"]=="sdl" then
285   forcedincludes {
286      MAME_DIR .. "src/osd/sdl/sdlprefix.h"
287   }
288end
289
290265if _OPTIONS["targetos"]=="windows" then
291266configuration { "x64" }
292267   defines {
r245234r245235
703678         "-static-libstdc++",
704679         "-municode",
705680      }
706      if _OPTIONS["osd"]=="sdl" then
707         linkoptions {
708            "-Wl,--allow-multiple-definition",
709            "-static"
710         }
711         links {
712            "opengl32",
713            "SDL2",
714            "Imm32",
715            "version",
716            "ole32",
717            "oleaut32",
718         }
719      end
720681      links {
721682         "user32",
722683         "gdi32",
r245234r245235
871832
872833configuration { }
873834
835
874836group "libs"
875dofile(path.join("src", "3rdparty.lua"))
876dofile(path.join("src", "lib.lua"))
877837
878group "core"
879
880838if (not os.isfile(path.join("src", "osd",  _OPTIONS["osd"] .. ".lua"))) then
881839   error("Unsupported value '" .. _OPTIONS["osd"] .. "' for OSD")
882840end
883
884841dofile(path.join("src", "osd", _OPTIONS["osd"] .. ".lua"))
842
843dofile(path.join("src", "3rdparty.lua"))
844dofile(path.join("src", "lib.lua"))
845
846group "core"
847
885848dofile(path.join("src", "emu.lua"))
886849emuProject(_OPTIONS["target"],_OPTIONS["subtarget"])
887850
trunk/scripts/src/main.lua
r245234r245235
55      project (_target .. _subtarget)
66   end   
77   uuid (os.uuid(_target .."_" .. _subtarget))
8   kind "ConsoleApp"   
8   kind "ConsoleApp"
99
1010   options {
1111      "ForceCPP",
r245234r245235
2727         "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/osd/sdl/" .. _OPTIONS["target"] .. "-Info.plist"
2828      }
2929
30   configuration { "mingw*" }
30   configuration { "mingw*" or "vs*" }
3131      if _OPTIONS["osd"]=="sdl" then
3232         targetprefix "sdl"
3333      end
3434      targetextension ".exe"
35     
36   configuration { "vs*" }
37      if _OPTIONS["osd"]=="sdl" then
38         targetprefix "sdl"
39      end
40      targetextension ".exe"
41     
35
4236   configuration { "asmjs" }
4337      targetextension ".bc" 
44     
38
4539   configuration { }
4640      targetdir(MAME_DIR)
4741
r245234r245235
7670      "ocore_" .. _OPTIONS["osd"],
7771   }
7872   dofile("src/osd/" .. _OPTIONS["osd"] .. "_cfg.lua")
79   
73
8074   includedirs {
8175      MAME_DIR .. "src/emu",
8276      MAME_DIR .. "src/mame",
r245234r245235
9993            rcfile,
10094         }
10195      else
102      files {
103         MAME_DIR .. "src/osd/windows/mame.rc",
104      }
96         files {
97            MAME_DIR .. "src/osd/windows/mame.rc",
98         }
10599      end
106100   end
107101
trunk/scripts/src/osd/osdmini.lua
r245234r245235
1function includeosd()
2   includedirs {
3      MAME_DIR .. "src/osd",
4   }
5end
6
7
18project ("osd_" .. _OPTIONS["osd"])
29   uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
310   kind "StaticLib"
trunk/scripts/src/osd/sdl.lua
r245234r245235
1function includeosd()
2   includedirs {
3      MAME_DIR .. "src/osd",
4      MAME_DIR .. "src/osd/sdl",
5   }
6end
7
8
9forcedincludes {
10   MAME_DIR .. "src/osd/sdl/sdlprefix.h"
11}
12
13
14configuration { "mingw*" }
15      linkoptions {
16         "-Wl,--allow-multiple-definition",
17         "-static"
18      }
19      links {
20         "opengl32",
21         "SDL2",
22         "Imm32",
23         "version",
24         "ole32",
25         "oleaut32",
26      }
27
28
129project ("osd_" .. _OPTIONS["osd"])
230   uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
331   kind "StaticLib"
trunk/scripts/src/osd/windows.lua
r245234r245235
1function includeosd()
2   includedirs {
3      MAME_DIR .. "src/osd",
4      MAME_DIR .. "src/osd/windows",
5   }
6end
7
8
9forcedincludes {
10   MAME_DIR .. "src/osd/windows/winprefix.h"
11}
12
13
114project ("osd_" .. _OPTIONS["osd"])
215   uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
316   kind "StaticLib"

https://github.com/mamedev/mame/commit/78eedb8aba8699a3c3e340a12a93fe4a3dec467e

Previous 199869 Revisions Next

© 1997-2024 The MAME Team