Commit Graph

275 Commits

Author SHA1 Message Date
Miodrag Milanovic
66fec3db63 fix for OG :) (nw) 2015-06-03 08:02:20 +02:00
Olivier Galibert
511762fa2d Allow compiling with shared libraries [O. Galibert]
Put SHLIB=1 in the main makefile, or on the command line.

The idea is to get a *way* faster link with symbols.  It works at
least on linux, with one annoying caveat: you have to be in the
build/projects/sdl/mame/gmake-linux directory to start mame
afterwards.  We're going to move some things around to be able to use
LD_LIBRARY_PATH or have it start as-is from the root.
2015-05-31 13:25:17 +02:00
Miodrag Milanovic
81ee2e603e Removed -Wno-unused-variable for mingw/gcc (nw) 2015-05-31 00:15:46 -04:00
Cowering
f115ab2dd2 Let subtarget MESS (not MAME, yet) compile with Windows GCC 5.1 and lto. I am told 'any' recent GCC for Windows has gcc-ar wrapper, if not, change back the line in toolchain.lua (NW) 2015-05-29 17:43:09 -05:00
Cowering
6df44235c8 oops, forgot one 2015-05-28 17:17:20 -05:00
Cowering
ea2762e799 Merge branch 'master' of https://github.com/mamedev/mame 2015-05-28 17:07:47 -05:00
Miodrag Milanovic
548a982a3c Added skeleton support for Windows Phone and Windows Store - far from working(nw) 2015-05-28 20:06:33 +02:00
Cowering
fa92dbd8aa Merge branch 'master' of https://github.com/mamedev/mame
Conflicts:
	scripts/genie.lua
2015-05-27 11:47:40 -05:00
Cowering
110cbcba86 test 2015-05-27 11:44:12 -05:00
Miodrag Milanovic
b0243d6da9 Removed -Wno-unused-variable for mingw/gcc (nw) 2015-05-27 16:41:00 +02:00
Cowering
228b752d27 Merge branch 'master' of https://github.com/mamedev/mame 2015-05-27 09:28:41 -05:00
Cowering
6dfb5511af test 2015-05-27 09:28:37 -05:00
Miodrag Milanovic
2e772fb160 Added lua script/makefile changes to support building tests and portaudio (nw) 2015-05-27 15:02:33 +02:00
balr0g
79e17d0ad3 Remove nonstandard inline overloads (nw) 2015-05-16 15:57:07 -04:00
balr0g
9aa1670e6f Warn for self-assignment (nw) 2015-05-16 15:28:47 -04:00
Wilbert Pol
c196e94f77 whoops? (nw) 2015-05-16 11:01:19 +02:00
balr0g
323c298849 Clang supports -Wshadow, so allow it 2015-05-15 22:05:55 -04:00
Miodrag Milanovic
1e90d2ffdd added some flags for VS build for Peter (nw) 2015-05-15 18:45:23 +02:00
Cesare Falco
7652d47d8e Add makefile switch to choose linking against bundled OR system expat library. 2015-05-11 09:37:45 +02:00
Miodrag Milanovic
ca37d40f69 Removed comments and added generic license for whole team on top (nw) 2015-05-09 16:05:30 +02:00
Miodrag Milanovic
5df1b60963 MAME now represent full build, for building MESS drivers only use [Miodrag Milanovic]
make SUBTARGET=mess, for building only Arcades drivers only use:
make SUBTARGET=arcade
2015-05-09 15:10:29 +02:00
Miodrag Milanovic
d33822a35c ssues with white-space in MAME_DIR [qmc2] 2015-04-30 13:20:36 +02:00
Miodrag Milanovic
3a37417a6b use target suffixes only for main executable (nw) 2015-04-25 13:02:38 +02:00
Miodrag Milanovic
45d4aed8b7 do not strip by default 2015-04-22 14:24:41 +02:00
Miodrag Milanovic
3827f898ab Renamed to STRIP_SYMBOLS and made logic more clear (nw) 2015-04-22 14:23:49 +02:00
Miodrag Milanovic
073fd3f7d4 Added NO_STRIPPING option and enabled stripping of executable by default (nw) 2015-04-19 16:21:36 +02:00
Miodrag Milanovic
f56db1ff3f fixed android compile (nw) 2015-04-18 12:51:33 +02:00
couriersud
0d60fe7805 Make sure USE_OPENMP is passed via define. (nw) 2015-04-17 18:05:01 +02:00
couriersud
119d23192b Fix OPENMP linking. (nw) 2015-04-16 23:44:30 +02:00
Miodrag Milanovic
08747b36ec test for linking (nw) 2015-04-16 13:44:11 +02:00
Miodrag Milanovic
74c337de45 Should speedup OSX builds (nw) 2015-04-15 13:59:10 +02:00
Miodrag Milanovic
59e60e47df Added SHADOW_CHECK parameter so we can work on shadowing issues in our code (nw) 2015-04-11 08:46:02 +02:00
Miodrag Milanovic
7950ff092e Make it work on VS2010 (nw) 2015-04-11 07:29:41 +02:00
Miodrag Milanovic
9458659b71 VS2015 compile works (nw) 2015-04-10 15:34:16 +02:00
Miodrag Milanovic
5e79b9c0e1 Fixes for solaris 11 build (nw) 2015-04-10 13:56:33 +02:00
Miodrag Milanovic
32dc24420c Some changes for FreeBSD and Solaris, will be sent upstream as well (nw) 2015-04-10 12:37:34 +02:00
Miodrag Milanovic
73dfafaa95 removed vconv, updated warnings/error for vs and icl (nw) 2015-04-09 13:05:10 +02:00
Miodrag Milanovic
899f23a7ec Added PYTHON_EXECUTABLE to use differently named python executable(nw) 2015-04-08 14:19:43 +02:00
Miodrag Milanovic
cc35d05ec0 added SEPARATE_BIN option to put executable files in bin folder and not in main (useful for continuous integration )(nw) 2015-04-08 08:52:02 +02:00
Miodrag Milanovic
209734925f Added FILTER_DEPS option for post compile filtering (nw) 2015-04-07 13:23:31 +02:00
Miodrag Milanovic
c562cfb1c2 well it helps some environments, back till deps are solved 2015-04-07 07:27:02 +02:00
Miodrag Milanovic
60d67c8c12 my mistake (nw) 2015-04-06 18:52:40 +02:00
Miodrag Milanovic
13f137dde7 And one more (nw) 2015-04-06 16:33:21 +02:00
Miodrag Milanovic
1ff712db7a resurrected some more compile options (nw) 2015-04-06 16:27:14 +02:00
Miodrag Milanovic
3ffde3b978 postcompile task is unstable, commented for now (nw) 2015-04-06 13:21:28 +02:00
Miodrag Milanovic
eb8b8902d0 Fix for PROFILER build (nw) 2015-04-06 12:37:14 +02:00
Miodrag Milanovic
f0b6bb5407 removed premake.make.linkoptions_after, need better static library dependency solution (nw) 2015-04-06 11:54:03 +02:00
Miodrag Milanovic
1de80e729e macosx build fix (nw) 2015-04-06 10:46:21 +02:00
Oliver Stöneberg
3a40df147d make DEBUG=1 PROFILER=0 actually work (nw)
also removed FASTDEBUG hack made obsolete by this fix
2015-04-05 21:38:28 +02:00
Miodrag Milanovic
b0dee85979 Selected Full Optimization for Release Visual Studio builds (nw) 2015-04-05 15:15:02 +02:00
Miodrag Milanovic
c8b9fc1efb Fixed linking on some linux platforms 2015-04-05 10:37:11 +02:00
Miodrag Milanovic
9c6fa77b47 Implemented filtering of dependency files, only active if machine have awk or gawk installed (nw) 2015-04-04 19:57:12 +02:00
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
Miodrag Milanovic
66cbe9eee4 removed os_version, since it is not used anymore (nw) 2015-04-03 15:30:56 +02:00
Vas Crabb
0a1b6b66b0 Fix warning with some clang configurations, don't automatically disable bgfx for 10.5 Leopard 2015-04-03 08:14:30 +11:00
Miodrag Milanovic
e97c4afe1f Merge branch 'master' of https://github.com/mamedev/mame 2015-04-02 17:39:00 +02:00
Miodrag Milanovic
23de91ccde Fix for backtick [qmc2](nw) 2015-04-02 19:04:09 +02:00
Miodrag Milanovic
86e36b4912 removed includeosd (nw) 2015-04-02 18:04:21 +02:00
Miodrag Milanovic
0de3599a07 xcode4 fixed (nw) 2015-04-02 17:38:28 +02:00
Vas Crabb
1532f81232 Enable BGFX by default on Snow Leopard 2015-04-03 01:54:26 +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
Vas Crabb
a63bd12019 Add back support for big endian targets including OSX-PPC 2015-04-02 22:26:35 +11: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
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
fe9339fa30 Add back DIRECTINPUT config for Windows OSD 2015-04-01 09:49:25 +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
399a5f914b Get rid of unnecessary distro nonsense 2015-04-01 03:03:17 +11:00
Miodrag Milanovic
5c03885252 Merge branch 'master' of https://github.com/mamedev/mame 2015-03-31 16:24:43 +02: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
5221cab621 create separate VisualStudio group for 3rdparty (nw) 2015-03-31 16:19:30 +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
df90d5068a Update to latest 3rdparty, fixes issues on OpenGL 2.1 for bgfx (nw) 2015-03-31 08:17:12 +02:00
Miodrag Milanovic
2f3d1de477 Added IgnoreLDFlags, change sent upstream (nw) 2015-03-30 15:24:18 +02:00
Curt Coder
1bc42a863e OS X 10.10 build fix by Micko. (nw) 2015-03-30 09:39:14 +03: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
c95c00c8c0 Separate OS and TARGETOS recognition and supported more platforms (nw) 2015-03-29 15:17:21 +02: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 Milanović
f2d6f4cde9 Commented until confirmed working on all platforms 2015-03-28 21:18:27 +01:00
Miodrag Milanovic
76803f7337 Added GAWK script to make deps more sane. thanks to OG.
For those not having latest build tools download :
http://gnuwin32.sourceforge.net/downlinks/gawk-bin-zip.php
and put in bin folder of mingw so it is in path
2015-03-28 20:54:22 +01:00
Miodrag Milanovic
64e76caae5 Added NoDependency flag to disable dependency file creation, until
create sane exclude of specific paths (nw)
2015-03-28 18:15:33 +01:00
Miodrag Milanovic
6825ee0a55 Made ume target include mame and mess targets (nw) 2015-03-28 15:19:21 +01:00
Miodrag Milanovic
ce5ccff643 added NOWERROR support (nw) 2015-03-28 07:03:44 +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
eca145893d Generate project files into OSD subdir to facilitate building multiple OSDs 2015-03-28 15:38:12 +11:00
Vas Crabb
78eedb8aba Move more OSD-specific stuff to OSD scripts 2015-03-28 15:09:22 +11:00
Miodrag Milanovic
a539224998 propagated USE_BGFX for unsupported platforms (nw) 2015-03-27 17:19:57 +01:00
mamehaze
c03feee2c2 port needed warning disables from vconv.c to genie.lua for using icl15 (nw) 2015-03-27 16:36:13 +00:00
Miodrag Milanovic
9b8b9062ff and even more (nw) 2015-03-27 16:43:54 +01:00
Miodrag Milanovic
f4a3b373df better fix (nw) 2015-03-27 16:41:59 +01:00
Miodrag Milanovic
a24c492c6b Fix for DRC, thanks Vas (nw) 2015-03-27 16:24:07 +01:00
Miodrag Milanovic
5877841729 fixed OSX build with Clang on 10.7.x (nw)
Removed internal CC and LD  settings since it's not
needed and can be overwritten  externally now
2015-03-27 14:36:13 +01:00
Miodrag Milanovic
59a15be847 Fix for GCC 4.2.1, OSX using gcc (nw) 2015-03-27 14:00:01 +01:00
Miodrag Milanovic
e14a06de87 Split OSD per file [qmc2] 2015-03-27 13:01:03 +01:00
Miodrag Milanovic
3fc637d9c6 Create makefiles for targets per subdir (nw) 2015-03-27 08:06:15 +01:00
Miodrag Milanovic
3d34fd00eb fix for DRC (nw) 2015-03-26 19:29:26 +01:00
Miodrag Milanovic
e38220cd9c Fix for symbols (nw) 2015-03-26 16:57:32 +01:00
Miodrag Milanovic
69d4d86e74 add postbuild only to main file (nw) 2015-03-26 16:48:24 +01:00
Miodrag Milanovic
c29a2b4517 sym file generate on mingw in postbuild process (nw) 2015-03-26 16:37:53 +01:00
Miodrag Milanovic
2444ae8149 Include symbols in builds (nw) 2015-03-26 16:26:10 +01:00
Miodrag Milanovic
44666525b7 Fixed location of map file (nw) 2015-03-26 15:57:34 +01:00
Miodrag Milanovic
604d83b1e3 Added CXX and fixed LD [qmc2] (nw) 2015-03-26 15:49:06 +01:00
Miodrag Milanovic
b4d9920e10 More parameter handling (nw) 2015-03-26 15:45:59 +01:00
Miodrag Milanovic
726de20508 Made CC and LD override possible (nw) 2015-03-26 14:43:39 +01:00
Miodrag Milanovic
c21bf6fd5d Merge branch 'master' of https://github.com/mamedev/mame 2015-03-26 14:01:38 +01:00
Miodrag Milanovic
5310d041d5 added distro support for linux (nw) 2015-03-26 14:01:14 +01:00
Vas Crabb
2605b33035 Fix tools link on OSX, only embed plist in main target 2015-03-26 23:45:14 +11:00
Vas Crabb
eb8bd38fa8 Embed version information for OSX 2015-03-26 23:45:13 +11:00
Miodrag Milanovic
6f7ac1a200 fix gcc version to use 2015-03-26 13:19:28 +01:00
Miodrag Milanovic
362404cb5c add this for all gcc versions (nw) 2015-03-26 11:56:52 +01:00
Miodrag Milanovic
53340a5f89 changed .build to build to be visible (nw) 2015-03-26 11:17:59 +01:00
Miodrag Milanovic
c869696a3f Fix clang and one more warning added 2015-03-26 10:20:29 +01:00
Miodrag Milanovic
9358a61e7a made tools to be built with TOOLS=1 param (nw) 2015-03-26 09:35:10 +01:00
Miodrag Milanovic
f76d59c41d Moved build system to GENie [Miodrag Milanovic]
make TARGET=mess -j19

will generate all needed files and build MESS, while developing you can use

make TARGET=mess COMPILE=1 -j19
to prevent rebuilding of make files.

Build system have automatic generate of dependencies so will do incremental builds fine.

make clean
will remove all generated files/projects and obj files
2015-03-26 09:00:39 +01:00