Previous 199869 Revisions Next

r36840 Tuesday 31st March, 2015 at 16:44:38 UTC by Vasantha Crabb
Restore DONT_USE_NETWORK
[/trunk]makefile
[scripts]genie.lua
[scripts/src/osd]sdl.lua sdl_cfg.lua windows_cfg.lua

trunk/makefile
r245351r245352
302302endif
303303PARAMS += --USE_QT=$(USE_QT)
304304
305ifdef DONT_USE_NETWORK
306PARAMS += --DONT_USE_NETWORK='$(DONT_USE_NETWORK)'
307endif
308
305309ifdef NO_OPENGL
306310PARAMS += --NO_OPENGL='$(NO_OPENGL)'
307311endif
trunk/scripts/genie.lua
r245351r245352
189189      { "0",   "Disabled"    },
190190      { "1",   "Enabled"      },
191191   }
192}
192}
193193
194newoption {
195   trigger = "DONT_USE_NETWORK",
196   description = "Disable network access",
197}
198
194199local os_version = str_to_version(_OPTIONS["os_version"])
195200
196201USE_BGFX = 1
trunk/scripts/src/osd/sdl.lua
r245351r245352
265265end
266266
267267
268BASE_TARGETOS = "unix"
269SDLOS_TARGETOS = "unix"
268BASE_TARGETOS       = "unix"
269SDLOS_TARGETOS      = "unix"
270270SYNC_IMPLEMENTATION = "tc"
271if _OPTIONS["targetos"]=="openbsd" then
271SDL_NETWORK         = ""
272if _OPTIONS["targetos"]=="linux" then
273   SDL_NETWORK         = "taptun"
274elseif _OPTIONS["targetos"]=="openbsd" then
272275   SYNC_IMPLEMENTATION = "ntc"
273276elseif _OPTIONS["targetos"]=="netbsd" then
274277   SYNC_IMPLEMENTATION = "ntc"
278   SDL_NETWORK         = "pcap"
275279elseif _OPTIONS["targetos"]=="haiku" then
276280   SYNC_IMPLEMENTATION = "ntc"
277281elseif _OPTIONS["targetos"]=="emscripten" then
278282   SYNC_IMPLEMENTATION = "mini"
279283elseif _OPTIONS["targetos"]=="windows" then
280   BASE_TARGETOS = "win32"
281   SDLOS_TARGETOS = "win32"
284   BASE_TARGETOS       = "win32"
285   SDLOS_TARGETOS      = "win32"
282286   SYNC_IMPLEMENTATION = "windows"
287   SDL_NETWORK         = "pcap"
283288elseif _OPTIONS["targetos"]=="macosx" then
284   SDLOS_TARGETOS = "macosx"
289   SDLOS_TARGETOS      = "macosx"
285290   SYNC_IMPLEMENTATION = "ntc"
291   SDL_NETWORK         = "pcap"
286292elseif _OPTIONS["targetos"]=="os2" then
287   BASE_TARGETOS = "os2"
288   SDLOS_TARGETOS = "os2"
293   BASE_TARGETOS       = "os2"
294   SDLOS_TARGETOS      = "os2"
289295   SYNC_IMPLEMENTATION = "os2"
290296end
291297
trunk/scripts/src/osd/sdl_cfg.lua
r245351r245352
22   MAME_DIR .. "src/osd/sdl/sdlprefix.h"
33}
44
5if SDL_NETWORK~="" and not _OPTIONS["DONT_USE_NETWORK"] then
6   defines {
7      "SDLMAME_NET_" .. string.upper(SDL_NETWORK),
8   }
9end
10
511if _OPTIONS["NO_OPENGL"]=="1" then
612   defines {
713      "USE_OPENGL=0",
r245351r245352
119125      "UNICODE",
120126      "_UNICODE",
121127      "USE_QTDEBUG=" .. USE_QT,
122      "SDLMAME_NET_PCAP",
123128      "main=utf8_main",
124129   }
125130   configuration { "mingw*" }
r245351r245352
138143elseif _OPTIONS["targetos"]=="linux" then
139144   defines {
140145      "USE_QTDEBUG=" .. USE_QT,
141      "SDLMAME_NET_TAPTUN",
142146   }
143147   buildoptions {
144148      '$(shell pkg-config --cflags QtGui)',
r245351r245352
148152      "SDLMAME_MACOSX",
149153      "SDLMAME_DARWIN",
150154      "USE_QTDEBUG=0",
151      "SDLMAME_NET_PCAP",
152155   }
153156elseif _OPTIONS["targetos"]=="freebsd" then
154157   buildoptions {
trunk/scripts/src/osd/windows_cfg.lua
r245351r245352
77   "USE_OPENGL=1",
88   "USE_DISPATCH_GL=1",
99   "DIRECTINPUT_VERSION=0x0800",
10   "SDLMAME_NET_PCAP",
1110   "main=utf8_main",
1211   "_WIN32_WINNT=0x0501",
1312}
13
14if not _OPTIONS["DONT_USE_NETWORK"] then
15   defines {
16      "SDLMAME_NET_PCAP",
17   }
18end


Previous 199869 Revisions Next


© 1997-2024 The MAME Team