Miodrag Milanovic
6f0fd1a366
Merge branch 'master' of https://github.com/mamedev/mame
2015-04-04 14:44:22 +02:00
Miodrag Milanovic
1026d09afa
Moved creation of most non-layout files out of makefile (nw)
2015-04-04 14:44:06 +02:00
Vas Crabb
73f53bb15e
* Take more link dependencies caused by OSD out of genie.lua
...
* Always dynamically link SDL on Windows
* Fix SDL1 build on Windows
2015-04-04 18:25:04 +11:00
Vas Crabb
f947a9b160
Harmonise targetos between genie.lua and sdl{,_config}.lua
2015-04-04 15:13:48 +11:00
Vas Crabb
a119fc50ab
Remove some obsolete code, enable MALLOC_DEBUG for SDLWin32
2015-04-04 15:05:21 +11:00
Vas Crabb
4cd434246d
Bring back USE_SDL, CYGWIN_BUILD and malloc debugging for Windows OSD
2015-04-04 14:53:47 +11:00
Miodrag Milanovic
86e36b4912
removed includeosd (nw)
2015-04-02 18:04:21 +02:00
Vas Crabb
9d63532184
SDL1 does not work with BFGX
2015-04-03 01:59:42 +11:00
Vas Crabb
453fd07fa0
Add a nice wrapper for doing backtick-like processing of command output
2015-04-02 22:53:14 +11:00
Miodrag Milanovic
39fc214596
typo fix, SDL compile fix [qmc2] (nw)
2015-04-01 14:08:14 +02:00
Miodrag Milanovic
627b7c61dc
Ok shuffling done
2015-04-01 12:02:13 +02:00
Miodrag Milanovic
9207811ed5
fix it properly (nw)
2015-04-01 11:06:53 +02:00
Miodrag Milanovic
42ffb726fa
uf reverting breaks mingw (nw)
2015-04-01 10:57:03 +02:00
Miodrag Milanovic
d504fa25ff
moved unicode specific build defines in genie.lua to fix tools build (nw)
2015-04-01 10:53:26 +02:00
Miodrag Milanovic
ec0553414d
MSVC build fix (nw)
2015-04-01 10:27:34 +02:00
Vas Crabb
ab50ffac9d
Move osdcore.c back into libocore, don't allow libutil to #include osd
2015-04-01 18:50:27 +11:00
Vas Crabb
5ca7080703
Link osdnet into a library reflecting its location, define USE_NETWORK properly, don't use SDL in non-SDL-specific macros
2015-04-01 18:00:35 +11:00
Vas Crabb
19d52cef70
Bring back NOASM
2015-04-01 16:12:03 +11:00
Vas Crabb
1ea04c4eb6
Build Qt debugger on OSX if requested
2015-04-01 12:09:38 +11:00
Vas Crabb
fe9339fa30
Add back DIRECTINPUT config for Windows OSD
2015-04-01 09:49:25 +11:00
Vas Crabb
eb30b3fbb0
Can't use BGFX or QT without X11 on *NIX
2015-04-01 07:41:46 +11:00
Vas Crabb
4d84885a29
Refactor out common OSD modules into separate lua file
2015-04-01 07:29:54 +11:00
Vas Crabb
b64e4ecee5
Restore DONT_USE_NETWORK
2015-04-01 03:44:38 +11:00
Vas Crabb
d7d3818ea6
WTF was I thinking
2015-04-01 03:06:55 +11:00
Vas Crabb
1f2763cc32
Restore SDL2_MULTIAPI
2015-04-01 03:03:18 +11:00
Vas Crabb
00bfd00a43
Fix USE_BGFX=0 with windows OSD
2015-04-01 03:03:18 +11:00
Vas Crabb
30ef0cb847
Small cleanup to how macros are defined for SDL OSD
2015-04-01 03:03:17 +11:00
Vas Crabb
6116f8c4fa
Restore MESA_INSTALL_ROOT
2015-04-01 01:21:59 +11:00
Vas Crabb
dbc99041c3
Restore NO_OPENGL and USE_DISPATCH_GL
2015-04-01 01:21:59 +11:00
Vas Crabb
9a2c6d95c8
Restore NO_USE_MIDI and some more OS support from the old SDL makefile
2015-04-01 01:21:59 +11:00
Miodrag Milanovic
e5f612d174
Made SDL build to be able to be compiled on VS (nw)
2015-03-31 13:57:02 +02:00
Miodrag Milanovic
636cacd0c8
Removed not needed flag since duplicate has been removed (nw)
2015-03-31 12:11:19 +02:00
Vas Crabb
1f163a762e
Get NO_X11, NO_USE_XINPUT and SDL_LIBVER working on Linux
2015-03-31 20:46:51 +11:00
Vas Crabb
ea348ff9f1
Bring back some SDL OSD configurability (WIP)
2015-03-31 20:46:51 +11:00
Miodrag Milanovic
49545f9e84
Remove need for winprefix.h and moved alloca define to osdcomm.h (nw)
2015-03-31 11:09:10 +02:00
Vas Crabb
3567c77114
Restore ledutil for windows builds with TOOLS=1
2015-03-30 19:14:52 +11:00
couriersud
a67f2cb095
Fix compile. (nw)
2015-03-29 22:50:55 +02:00
couriersud
4a6023e471
Added two more options to the build system:
...
USE_QT: Compile the QT Debugger. Default is USE_QT=1 (except macosx),
use USE_QT=0 to disable.
LDOPTS: Optional LDFLAGs.
These are mainly used for cross compilation. The following will compile
a windows SDL build without QT debugger on linux:
make TARGETOS=windows PTR64=1 OSD=sdl OS=linux \
OVERRIDE_CC="@x86_64-w64-mingw32-gcc" \
OVERRIDE_CXX="@x86_64-w64-mingw32-g++" \
OVERRIDE_LD="x86_64-w64-mingw32-g++" \
WINDRES="x86_64-w64-mingw32-windres" \
USE_QT=0 \
ARCHOPTS="-idirafter ${MINGW64DIR}/x86_64-w64-mingw32/include/ \
-I${MINGW64DIR}/Qt/include/ -v" SUBTARGET=tiny MINGW64=/usr \ \
LDOPTS="-L/mnt/mfhome/andre/mame/w64crosslibs"
2015-03-29 18:58:39 +02:00
Miodrag Milanovic
93025d33c1
Added network flags (nw)
2015-03-29 10:57:10 +02:00
Vas Crabb
c73dbdeaf3
Small cleanup
2015-03-29 18:35:48 +11:00
Vas Crabb
3010be4c30
SDL and Windows strconv are the same thing.
2015-03-29 18:23:02 +11:00
Vas Crabb
c878883667
Remove all the stuff that causes driver and emu sources to be compiled
...
differently with different OSDs
Switch back to building for all OSDs in common directory
Move more OSD-specific stuff into OSD scripts
It still isn't completely safe to be building all OSD into same directory
Common OSD "module" files, e.g. debuggers and renderers, build with
different options for each OSD. It works at the moment, but you will end
up with slightly different executables depending on the order you build
OSDs.
2015-03-29 15:02:23 +11:00
Miodrag Milanovic
d90b5dd812
fix for osx debugger (nw)
2015-03-28 11:51:25 +01:00
Miodrag Milanovic
7f1ad1db99
Explicit file listing in lua scripts making generate much much faster (nw)
2015-03-28 10:10:03 +01:00
Miodrag Milanovic
aea6bc4bb8
linkoptions for QT are needed (nw)
2015-03-28 07:15:14 +01:00
Vas Crabb
4303fbc35c
Put some OSD libs back in main GENie file to fix WinSDL build for now
2015-03-28 16:20:04 +11:00
Vas Crabb
a9bc80bd4b
build into OSD subdirectory for people building multiple OSDs
2015-03-28 16:06:06 +11:00
Vas Crabb
78eedb8aba
Move more OSD-specific stuff to OSD scripts
2015-03-28 15:09:22 +11:00
Miodrag Milanovic
e14a06de87
Split OSD per file [qmc2]
2015-03-27 13:01:03 +01:00
