Previous 199869 Revisions Next

r36855 Tuesday 31st March, 2015 at 22:49:25 UTC by Vasantha Crabb
Add back DIRECTINPUT config for Windows OSD
[/trunk]makefile
[scripts]genie.lua
[scripts/src/osd]windows.lua

trunk/makefile
r245366r245367
313313PARAMS += --USE_QTDEBUG='$(USE_QTDEBUG)'
314314endif
315315
316ifdef DIRECTINPUT
317PARAMS += --DIRECTINPUT='$(DIRECTINPUT)'
318endif
319
316320ifdef MESA_INSTALL_ROOT
317321PARAMS += --MESA_INSTALL_ROOT='$(MESA_INSTALL_ROOT)'
318322endif
trunk/scripts/genie.lua
r245366r245367
721721         "comctl32",
722722         "shlwapi",
723723         "wsock32",
724         "dinput8",
725724         "comdlg32",
726725      }
727726
r245366r245367
743742         "comctl32",
744743         "shlwapi",
745744         "wsock32",
746         "dinput8",
747745         "comdlg32",
748746      }
749747
trunk/scripts/src/osd/windows.lua
r245366r245367
88      "-municode",
99   }
1010
11   if _OPTIONS["DIRECTINPUT"] == "8" then
12      links {
13         "dinput8",
14      }
15   else
16      links {
17         "dinput",
18      }
19   end
20
1121   local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _target ..".rc"
1222
1323   if os.isfile(rcfile) then
r245366r245367
2232end
2333
2434
35newoption {
36   trigger = "DIRECTINPUT",
37   description = "Minimum DirectInput version to support",
38   allowed = {
39      { "7",  "Support DirectInput 7 or later"  },
40      { "8",  "Support DirectInput 8 or later" },
41   },
42}
43
44if not _OPTIONS["DIRECTINPUT"] then
45   _OPTIONS["DIRECTINPUT"] = "8"
46end
47
48
2549project ("osd_" .. _OPTIONS["osd"])
2650   uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
2751   kind "StaticLib"
r245366r245367
3054   osdmodulesbuild()
3155
3256   defines {
33      "DIRECTINPUT_VERSION=0x0800",
3457      "DIRECT3D_VERSION=0x0900",
3558   }
3659
60   if _OPTIONS["DIRECTINPUT"] == "8" then
61      defines {
62         "DIRECTINPUT_VERSION=0x0800",
63      }
64   else
65      defines {
66         "DIRECTINPUT_VERSION=0x0700",
67      }
68   end
69
3770   includedirs {
3871      MAME_DIR .. "src/emu",
3972      MAME_DIR .. "src/osd",


Previous 199869 Revisions Next


© 1997-2024 The MAME Team