MAMEWorld Central >> EmuChat
View all threads Index   Flat Mode Flat  

johnsmallberries
MAME Fan
Reged: 11/24/12
Posts: 2
Send PM
Re: minor MAME samples question.
09/01/17 12:07 AM


You can take the current version and try to revert just the votrax changes(2c79c1ed) but it looks like there are conflicts on some of the files and they have to be resolved. I've tried resolving but still get compiler errors because I'm not that familiar with the code, but if somebody has any idea of how to merge those back with HEAD we could use the current mame version with the old samples.

Unmerged paths:
both modified: src/devices/sound/votrax.cpp
both modified: src/devices/sound/votrax.h
both modified: src/mame/audio/gottlieb.cpp
both modified: src/mame/audio/gottlieb.h
both modified: src/mame/drivers/astrocde.cpp







Entire thread
Subject Posted by Posted on
* minor MAME samples question. simion 08/22/17 07:02 PM
. * Modified 0.189 build MooglyGuy  09/02/17 12:37 AM
. * awesome simion  09/12/17 02:47 AM
. * Re: awesome simion  09/12/17 05:05 PM
. * Re: Modified 0.189 build gregf  09/02/17 08:03 PM
. * Re: Modified 0.189 build johnsmallberries  09/02/17 02:03 AM
. * Re: Modified 0.189 build MooglyGuy  09/02/17 02:48 AM
. * Re: Modified 0.189 build B2K24  09/02/17 02:29 AM
. * Oh, and for the record MooglyGuy  09/02/17 01:12 AM
. * Re: Modified 0.189 build Envisaged0ne  09/02/17 01:08 AM
. * Re: minor MAME samples question. johnsmallberries  09/01/17 12:07 AM
. * Re: minor MAME samples question gregf  08/22/17 08:28 PM
. * Re: minor MAME samples question. *DELETED* *DELETED* CiroConsentino  08/22/17 07:19 PM
. * Re: minor MAME samples question. BIOS-D  08/23/17 06:32 PM
. * Re: minor MAME samples question. Sgt Jack V  08/23/17 09:44 PM
. * Re: minor MAME samples question. BIOS-D  08/24/17 10:19 AM
. * Re: minor MAME samples question. gregf  08/22/17 08:03 PM

Extra information Permissions
Moderator:  redk9258, URherenow, Tafoid 
0 registered and 36 anonymous users are browsing this forum.
You cannot start new topics
You cannot reply to topics
HTML is enabled
UBBCode is enabled
Thread views: 774