Move nukedopl to libs
This way there's no need to reformat the nukedopl code to adhere to DOSBox coding conventions.
This commit is contained in:
parent
64b90ab930
commit
f4609262bf
8 changed files with 17 additions and 7 deletions
|
@ -575,6 +575,7 @@ src/libs/Makefile
|
|||
src/libs/zmbv/Makefile
|
||||
src/libs/gui_tk/Makefile
|
||||
src/libs/decoders/Makefile
|
||||
src/libs/nuked/Makefile
|
||||
src/misc/Makefile
|
||||
src/shell/Makefile
|
||||
src/platform/Makefile
|
||||
|
|
|
@ -14,6 +14,9 @@ endif
|
|||
dosbox_SOURCES = dosbox.cpp $(ico_stuff)
|
||||
dosbox_LDADD = cpu/libcpu.a debug/libdebug.a dos/libdos.a fpu/libfpu.a hardware/libhardware.a gui/libgui.a \
|
||||
ints/libints.a misc/libmisc.a shell/libshell.a hardware/mame/libmame.a \
|
||||
hardware/serialport/libserial.a libs/gui_tk/libgui_tk.a libs/decoders/libdecoders.a
|
||||
hardware/serialport/libserial.a \
|
||||
libs/decoders/libdecoders.a \
|
||||
libs/gui_tk/libgui_tk.a \
|
||||
libs/nuked/libnuked.a
|
||||
|
||||
EXTRA_DIST = winres.rc dosbox.ico
|
||||
|
|
|
@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
|
|||
|
||||
SUBDIRS = serialport mame
|
||||
|
||||
EXTRA_DIST = opl.cpp opl.h adlib.h dbopl.h pci_devices.h nukedopl.h
|
||||
EXTRA_DIST = opl.cpp opl.h adlib.h dbopl.h pci_devices.h
|
||||
|
||||
noinst_LIBRARIES = libhardware.a
|
||||
|
||||
|
@ -10,4 +10,4 @@ libhardware_a_SOURCES = adlib.cpp dma.cpp gameblaster.cpp hardware.cpp iohandler
|
|||
memory.cpp mixer.cpp pcspeaker.cpp pci_bus.cpp pic.cpp sblaster.cpp tandy_sound.cpp timer.cpp \
|
||||
vga.cpp vga_attr.cpp vga_crtc.cpp vga_dac.cpp vga_draw.cpp vga_gfx.cpp vga_other.cpp \
|
||||
vga_memory.cpp vga_misc.cpp vga_seq.cpp vga_xga.cpp vga_s3.cpp vga_tseng.cpp vga_paradise.cpp \
|
||||
cmos.cpp disney.cpp gus.cpp mpu401.cpp ipx.cpp ipxserver.cpp dbopl.cpp nukedopl.cpp
|
||||
cmos.cpp disney.cpp gus.cpp mpu401.cpp ipx.cpp ipxserver.cpp dbopl.cpp
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
|
@ -27,12 +26,13 @@
|
|||
#include "mapper.h"
|
||||
#include "mem.h"
|
||||
#include "dbopl.h"
|
||||
#include "nukedopl.h"
|
||||
#include "../libs/nuked/nukedopl.h"
|
||||
|
||||
#include "mame/emu.h"
|
||||
#include "mame/fmopl.h"
|
||||
#include "mame/ymf262.h"
|
||||
|
||||
|
||||
#define OPL2_INTERNAL_FREQ 3600000 // The OPL2 operates at 3.6MHz
|
||||
#define OPL3_INTERNAL_FREQ 14400000 // The OPL3 operates at 14.4MHz
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
|
||||
SUBDIRS = zmbv gui_tk decoders
|
||||
|
||||
SUBDIRS = zmbv gui_tk decoders nuked
|
||||
|
|
7
src/libs/nuked/Makefile.am
Normal file
7
src/libs/nuked/Makefile.am
Normal file
|
@ -0,0 +1,7 @@
|
|||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
|
||||
EXTRA_DIST = nukedopl.h
|
||||
|
||||
noinst_LIBRARIES = libnuked.a
|
||||
|
||||
libnuked_a_SOURCES = nukedopl.cpp
|
Loading…
Add table
Reference in a new issue