MAME SVN History

199869 Revisions

r34253 Wednesday 7th January, 2015 at 22:41:11 UTC by Ramiro Polla
Fix linking for Windows SDL cross-compilations - Library names must be lower-case when cross-compiling from Linux (-limm32 instead of -lImm32) - ntohl() needs -lws2_32

[/trunk]	makefile
[src/build]	file2str.py
[src/mame/video]	gaelco3d.c
[src/mess]	tiny.mak
[src/osd/modules/sync]	work_osd.c
[src/osd/sdl]	sdl.mak

trunk/makefile
r242764	r242765
504	504	ifeq ($(OSD),osdmini)
505	505	DEFS += -DOSD_MINI
506	506	else
507		$(warnin~~g Please add -DOSD_[SDL\|WINDOWS\|MINI] i~~n $(OSD~~).mak~~)
	507	$(error Unknown OSD)
508	508	endif
509	509	endif
510	510	endif

trunk/src/build/file2str.py
r242764	r242765
1	1	#!/usr/bin/python
2	2
3		from __future__ import with_statement
4
5	3	import string
6	4	import sys
7	5	import os
r242764	r242765
55	53	dst.close()
56	54	except IOError:
57	55	print("Unable to open output file '%s'" % dstfile)
58		sys.exit(-1)
	56	sys.exit(-1)
		No newline at end of file

trunk/src/mame/video/gaelco3d.c
r242764	r242765
228	228	rgb_t rgb01 = palsource[m_texture[(pixeloffs + 1) & endmask]];
229	229	rgb_t rgb10 = palsource[m_texture[(pixeloffs + 4096) & endmask]];
230	230	rgb_t rgb11 = palsource[m_texture[(pixeloffs + 4097) & endmask]];
231		~~UINT32~~ filtered = rgb_bilinear_filter(rgb00, rgb01, rgb10, rgb11, u, v);
	231	rgb_t filtered = rgb_bilinear_filter(rgb00, rgb01, rgb10, rgb11, u, v);
232	232	dest[x] = (filtered & 0x1f) \| ((filtered & 0x1ff800) >> 6);
233	233	zbuf[x] = zbufval;
234	234	}
r242764	r242765
275	275	rgb_t rgb01 = palsource[m_texture[(pixeloffs + 1) & endmask]];
276	276	rgb_t rgb10 = palsource[m_texture[(pixeloffs + 4096) & endmask]];
277	277	rgb_t rgb11 = palsource[m_texture[(pixeloffs + 4097) & endmask]];
278		~~UINT32~~ filtered = rgb_bilinear_filter(rgb00, rgb01, rgb10, rgb11, u, v);
	278	rgb_t filtered = rgb_bilinear_filter(rgb00, rgb01, rgb10, rgb11, u, v);
279	279	dest[x] = (filtered & 0x1f) \| ((filtered & 0x1ff800) >> 6);
280	280	zbuf[x] = (zbufval < 0) ? -zbufval : zbufval;
281	281	}
r242764	r242765
325	325	rgb_t rgb01 = palsource[m_texture[(pixeloffs + 1) & endmask]];
326	326	rgb_t rgb10 = palsource[m_texture[(pixeloffs + 4096) & endmask]];
327	327	rgb_t rgb11 = palsource[m_texture[(pixeloffs + 4097) & endmask]];
328		~~UINT32~~ filtered = rgb_bilinear_filter(rgb00, rgb01, rgb10, rgb11, u, v) >> 1;
	328	rgb_t filtered = rgb_bilinear_filter(rgb00, rgb01, rgb10, rgb11, u, v) >> 1;
329	329	dest[x] = ((filtered & 0x0f) \| ((filtered & 0x0f7800) >> 6)) + ((dest[x] >> 1) & 0x3def);
330	330	zbuf[x] = (zbufval < 0) ? -zbufval : zbufval;
331	331	}

trunk/src/mess/tiny.mak
r242764	r242765
48	48
49	49
50	50	#-------------------------------------------------
51		# specify available bus cores
52		#-------------------------------------------------
53
54		BUSES += COLECO
55
56		#-------------------------------------------------
57	51	# This is the list of files that are necessary
58	52	# for building all of the drivers referenced
59	53	# in tiny.c

trunk/src/osd/modules/sync/work_osd.c
r242764	r242765
207	207	// on a single-CPU system, create 1 thread for I/O queues, and 0 threads for everything else
208	208	if (numprocs == 1)
209	209	threadnum = (flags & WORK_QUEUE_FLAG_IO) ? 1 : 0;
210		// on an n-CPU system, create n-1 threads for multi queues, and 1 thread for everything else
	210	// on an n-CPU system, create n threads for multi queues, and 1 thread for everything else
211	211	else
212		threadnum = (flags & WORK_QUEUE_FLAG_MULTI) ? (numprocs ~~- 1)~~ : 1;
	212	threadnum = (flags & WORK_QUEUE_FLAG_MULTI) ? numprocs : 1;
213	213
214	214	if (osdworkqueuemaxthreads != NULL && sscanf(osdworkqueuemaxthreads, "%d", &osdthreadnum) == 1 && threadnum > osdthreadnum)
215	215	threadnum = osdthreadnum;

trunk/src/osd/sdl/sdl.mak
r242764	r242765
657	657	endif
658	658
659	659	ifeq ($(SDL_LIBVER),sdl2)
660		LIBS += -lSDL2 -lImm32 -lversion -lole32 -loleaut32 -static
661		BASELIBS += -lImm32 -lversion -lole32 -loleaut32 -static
	660	LIBS += -lSDL2 -limm32 -lversion -lole32 -loleaut32 -lws2_32 -static
	661	BASELIBS += -limm32 -lversion -lole32 -loleaut32 -lws2_32 -static
662	662	else
663	663	LIBS += -lSDL -static
664	664	endif

https://github.com/mamedev/mame/commit/929ef81d6cc575e605b1613a176413726e003e13

199869 Revisions