2008-10-12 21:02:27 +00:00
|
|
|
#
|
2007-05-29 03:06:33 +00:00
|
|
|
# Unified Makefile for Apple 2 SDL
|
|
|
|
#
|
2013-09-28 23:15:54 +00:00
|
|
|
# by James Hammons
|
2018-09-17 02:45:27 +00:00
|
|
|
# (C) 2005-2018 Underground Software
|
2014-04-02 18:00:00 +00:00
|
|
|
# This software is licensed under the GPL v3
|
2007-05-29 03:06:33 +00:00
|
|
|
#
|
|
|
|
|
2013-10-06 17:17:38 +00:00
|
|
|
FIND = find
|
2013-10-11 20:10:47 +00:00
|
|
|
FINDSDL2 := $(shell which $(CROSS)sdl2-config 2> /dev/null)
|
2013-10-06 17:17:38 +00:00
|
|
|
|
2007-05-29 03:06:33 +00:00
|
|
|
# Figure out which system we're compiling for, and set the appropriate variables
|
|
|
|
|
2013-10-11 20:10:47 +00:00
|
|
|
ifeq "$(CROSS)" ""
|
|
|
|
OSTYPE := $(shell uname -a)
|
|
|
|
|
|
|
|
# Win32
|
|
|
|
ifeq "$(findstring Msys,$(OSTYPE))" "Msys"
|
2007-05-29 03:06:33 +00:00
|
|
|
|
|
|
|
SYSTYPE = __GCCWIN32__
|
|
|
|
EXESUFFIX = .exe
|
|
|
|
ICON = obj/icon.o
|
Misc. improvements, added WOZ file support to floppy emulation
- Refactored old MMU slot code to be more flexible
- Moved all Mockingboard related code to its own compilation unit
- Refactored old 6522 & AY-3-8910 code into v6522VIA & vAY8910 :-)
- Fixed BCD mode for ADC and SBC in v65C02
- Finally fixed text mode characters in both ALTCHARSET and regular
modes
- Added new floppy disk controller Logic State Sequencer emulation
- Fixed v65C02 to be cycle exact (as far as I can tell)
- Fixed a bunch of bugs in v65C02
- Dropped NIB support
- Added WOZ 1.0 file support
That last item is a bit of a big deal, as I had been thinking about
writing a new file format that would be bit-based--since the NIB nybble
format, while better than pretty much all the other formats out there,
fails hard in things like extra sync bits and half tracks. So, somewhat
serendipitously, I stumbled upon the Applesauce project and found out
that not only had other people been thinking in more or less the same
direction, they had created it and had made disk images to try!
So now, because of this, WOZ is the internal format used by the floppy
emulation (as opposed to NIB) which, along with the new disk Logic State
Sequencer emulator, makes it possible to format floppy disks correctly
for the first time. :-)
One ironic consequence of this is that NIB format can no longer be
properly supported. The irony comes from the fact that before there was
LSS emulation, NIB was the most accurate format you could get to
represent the low level format of a disk, but now, with proper LSS
emulation, it's the worst format for representing a floppy disk. And
the main reason for this is that NIB doesn't contain sync bits, and has
no mechanism to represent them--so when feeding them to the new LSS
emulation, they will fail horribly because without sync bits, the
bitstream represented by a NIB formatted disk can and will be
misinterpreted by the LSS. And since there is now a format that
properly represents the bitstream on a floppy disk (WOZ), there's
absolutely no reason to keep NIB around or support it anymore. While it
was a nice interim format to have around (when the emulation of the disk
was "imperfectly perfect"), it now no longer has a place in disk
preservation and/or emulation.
Another consequence of this new format is that Apple2 only supports
writing of WOZ images--it will no longer support writing of DSK and its
bretheren. However, since those formats are extremely limited in their
scope (they literally only represented the contents of the sectors on a
disk) we still support reading them; Apple2 will automagically upconvert
them and save them as WOZs (it will use the same filename but substitute
"woz" for the old extension). So if you're wondering why your DSKs are
unchanged when saving to them, you now know why. :-)
Big, big thanks to the Applesauce guys and everyone who contributed and
continues to contribute to that project; your efforts are very much
appreciated--you guys are awesome!
2019-01-24 02:33:05 +00:00
|
|
|
SDLLIBTYPE = --static-libs
|
2007-05-29 03:06:33 +00:00
|
|
|
MSG = Win32 on MinGW
|
Misc. improvements, added WOZ file support to floppy emulation
- Refactored old MMU slot code to be more flexible
- Moved all Mockingboard related code to its own compilation unit
- Refactored old 6522 & AY-3-8910 code into v6522VIA & vAY8910 :-)
- Fixed BCD mode for ADC and SBC in v65C02
- Finally fixed text mode characters in both ALTCHARSET and regular
modes
- Added new floppy disk controller Logic State Sequencer emulation
- Fixed v65C02 to be cycle exact (as far as I can tell)
- Fixed a bunch of bugs in v65C02
- Dropped NIB support
- Added WOZ 1.0 file support
That last item is a bit of a big deal, as I had been thinking about
writing a new file format that would be bit-based--since the NIB nybble
format, while better than pretty much all the other formats out there,
fails hard in things like extra sync bits and half tracks. So, somewhat
serendipitously, I stumbled upon the Applesauce project and found out
that not only had other people been thinking in more or less the same
direction, they had created it and had made disk images to try!
So now, because of this, WOZ is the internal format used by the floppy
emulation (as opposed to NIB) which, along with the new disk Logic State
Sequencer emulator, makes it possible to format floppy disks correctly
for the first time. :-)
One ironic consequence of this is that NIB format can no longer be
properly supported. The irony comes from the fact that before there was
LSS emulation, NIB was the most accurate format you could get to
represent the low level format of a disk, but now, with proper LSS
emulation, it's the worst format for representing a floppy disk. And
the main reason for this is that NIB doesn't contain sync bits, and has
no mechanism to represent them--so when feeding them to the new LSS
emulation, they will fail horribly because without sync bits, the
bitstream represented by a NIB formatted disk can and will be
misinterpreted by the LSS. And since there is now a format that
properly represents the bitstream on a floppy disk (WOZ), there's
absolutely no reason to keep NIB around or support it anymore. While it
was a nice interim format to have around (when the emulation of the disk
was "imperfectly perfect"), it now no longer has a place in disk
preservation and/or emulation.
Another consequence of this new format is that Apple2 only supports
writing of WOZ images--it will no longer support writing of DSK and its
bretheren. However, since those formats are extremely limited in their
scope (they literally only represented the contents of the sectors on a
disk) we still support reading them; Apple2 will automagically upconvert
them and save them as WOZs (it will use the same filename but substitute
"woz" for the old extension). So if you're wondering why your DSKs are
unchanged when saving to them, you now know why. :-)
Big, big thanks to the Applesauce guys and everyone who contributed and
continues to contribute to that project; your efforts are very much
appreciated--you guys are awesome!
2019-01-24 02:33:05 +00:00
|
|
|
EXTRA = -static
|
2007-05-29 03:06:33 +00:00
|
|
|
|
2013-10-11 20:10:47 +00:00
|
|
|
# Should catch both 'darwin' and 'darwin7.0'
|
|
|
|
else ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"
|
2007-05-29 03:06:33 +00:00
|
|
|
|
|
|
|
SYSTYPE = __GCCUNIX__ -D_OSX_
|
|
|
|
EXESUFFIX =
|
|
|
|
ICON =
|
|
|
|
SDLLIBTYPE = --static-libs
|
|
|
|
MSG = Mac OS X
|
|
|
|
|
2013-10-11 20:10:47 +00:00
|
|
|
# *nix
|
|
|
|
else ifeq "$(findstring Linux,$(OSTYPE))" "Linux"
|
2007-05-29 03:06:33 +00:00
|
|
|
|
|
|
|
SYSTYPE = __GCCUNIX__
|
|
|
|
EXESUFFIX =
|
|
|
|
ICON =
|
|
|
|
SDLLIBTYPE = --libs
|
|
|
|
MSG = generic Unix/Linux
|
|
|
|
|
2013-10-11 20:10:47 +00:00
|
|
|
# Throw error, unknown OS
|
|
|
|
else
|
|
|
|
|
|
|
|
$(error OS TYPE UNDETECTED)
|
|
|
|
|
2007-05-29 03:06:33 +00:00
|
|
|
endif
|
2013-10-11 20:10:47 +00:00
|
|
|
# Cross compile using MXE under Linux host
|
|
|
|
else
|
|
|
|
|
|
|
|
SYSTYPE = __GCCWIN32__
|
|
|
|
EXESUFFIX = .exe
|
|
|
|
ICON = obj/icon.o
|
|
|
|
SDLLIBTYPE = --libs
|
|
|
|
MSG = Win32 under MXE (cross compile)
|
|
|
|
|
2007-05-29 03:06:33 +00:00
|
|
|
endif
|
|
|
|
|
2013-10-11 20:10:47 +00:00
|
|
|
CC = $(CROSS)gcc
|
|
|
|
LD = $(CROSS)gcc
|
2007-05-29 03:06:33 +00:00
|
|
|
TARGET = apple2
|
|
|
|
|
2013-10-11 20:10:47 +00:00
|
|
|
SDL_CFLAGS = `$(CROSS)sdl2-config --cflags`
|
|
|
|
SDL_LIBS = `$(CROSS)sdl2-config $(SDLLIBTYPE)`
|
|
|
|
DEFINES = -D$(SYSTYPE)
|
|
|
|
GCC_DEPS = -MMD
|
|
|
|
|
2007-05-29 03:06:33 +00:00
|
|
|
# Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
|
2013-09-09 02:18:23 +00:00
|
|
|
#CFLAGS = -MMD -Wall -Wno-switch -O2 -D$(SYSTYPE) -ffast-math -fomit-frame-pointer `sdl2-config --cflags`
|
2007-05-29 03:06:33 +00:00
|
|
|
#CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \
|
|
|
|
# No optimization and w/gcov flags, so that we get an accurate picture from gcov
|
|
|
|
#CFLAGS = -MMD -Wall -Wno-switch -D$(SYSTYPE) \
|
2013-09-09 02:18:23 +00:00
|
|
|
# -ffast-math -fomit-frame-pointer `sdl2-config --cflags` -fprofile-arcs -ftest-coverage
|
2007-05-29 03:06:33 +00:00
|
|
|
#CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -D$(SYSTYPE) \
|
2013-09-09 02:18:23 +00:00
|
|
|
# -ffast-math -fomit-frame-pointer `sdl2-config --cflags` -fprofile-arcs -ftest-coverage
|
2007-05-29 03:06:33 +00:00
|
|
|
# No optimization for profiling with gprof...
|
2013-10-11 20:10:47 +00:00
|
|
|
#CFLAGS = -MMD -Wall -Wno-switch -D$(SYSTYPE) \
|
|
|
|
# -ffast-math `sdl2-config --cflags` -pg -g
|
|
|
|
#CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -D$(SYSTYPE) \
|
|
|
|
# -ffast-math `sdl2-config --cflags` -pg -g
|
2013-09-09 02:18:23 +00:00
|
|
|
# -fomit-frame-pointer `sdl2-config --cflags` -g
|
|
|
|
# -fomit-frame-pointer `sdl2-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
|
2013-10-11 20:10:47 +00:00
|
|
|
CFLAGS = $(GCC_DEPS) -Wall -Wno-switch $(DEFINES) -ffast-math $(SDL_CFLAGS) -pg -g
|
|
|
|
CPPFLAGS = $(GCC_DEPS) -Wall -Wno-switch -Wno-non-virtual-dtor $(DEFINES) \
|
|
|
|
-ffast-math $(SDL_CFLAGS) -pg -g
|
2007-05-29 03:06:33 +00:00
|
|
|
|
Misc. improvements, added WOZ file support to floppy emulation
- Refactored old MMU slot code to be more flexible
- Moved all Mockingboard related code to its own compilation unit
- Refactored old 6522 & AY-3-8910 code into v6522VIA & vAY8910 :-)
- Fixed BCD mode for ADC and SBC in v65C02
- Finally fixed text mode characters in both ALTCHARSET and regular
modes
- Added new floppy disk controller Logic State Sequencer emulation
- Fixed v65C02 to be cycle exact (as far as I can tell)
- Fixed a bunch of bugs in v65C02
- Dropped NIB support
- Added WOZ 1.0 file support
That last item is a bit of a big deal, as I had been thinking about
writing a new file format that would be bit-based--since the NIB nybble
format, while better than pretty much all the other formats out there,
fails hard in things like extra sync bits and half tracks. So, somewhat
serendipitously, I stumbled upon the Applesauce project and found out
that not only had other people been thinking in more or less the same
direction, they had created it and had made disk images to try!
So now, because of this, WOZ is the internal format used by the floppy
emulation (as opposed to NIB) which, along with the new disk Logic State
Sequencer emulator, makes it possible to format floppy disks correctly
for the first time. :-)
One ironic consequence of this is that NIB format can no longer be
properly supported. The irony comes from the fact that before there was
LSS emulation, NIB was the most accurate format you could get to
represent the low level format of a disk, but now, with proper LSS
emulation, it's the worst format for representing a floppy disk. And
the main reason for this is that NIB doesn't contain sync bits, and has
no mechanism to represent them--so when feeding them to the new LSS
emulation, they will fail horribly because without sync bits, the
bitstream represented by a NIB formatted disk can and will be
misinterpreted by the LSS. And since there is now a format that
properly represents the bitstream on a floppy disk (WOZ), there's
absolutely no reason to keep NIB around or support it anymore. While it
was a nice interim format to have around (when the emulation of the disk
was "imperfectly perfect"), it now no longer has a place in disk
preservation and/or emulation.
Another consequence of this new format is that Apple2 only supports
writing of WOZ images--it will no longer support writing of DSK and its
bretheren. However, since those formats are extremely limited in their
scope (they literally only represented the contents of the sectors on a
disk) we still support reading them; Apple2 will automagically upconvert
them and save them as WOZs (it will use the same filename but substitute
"woz" for the old extension). So if you're wondering why your DSKs are
unchanged when saving to them, you now know why. :-)
Big, big thanks to the Applesauce guys and everyone who contributed and
continues to contribute to that project; your efforts are very much
appreciated--you guys are awesome!
2019-01-24 02:33:05 +00:00
|
|
|
LDFLAGS = $(EXTRA)
|
2007-05-29 03:06:33 +00:00
|
|
|
|
2013-09-09 02:18:23 +00:00
|
|
|
#LIBS = -L/usr/local/lib -L/usr/lib `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
|
2007-05-29 03:06:33 +00:00
|
|
|
# Link in the gcov library (for profiling purposes)
|
2013-09-09 02:18:23 +00:00
|
|
|
#LIBS = -L/usr/local/lib -L/usr/lib `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -lgcov
|
2007-05-29 03:06:33 +00:00
|
|
|
# Link in the gprof lib
|
2013-10-11 20:10:47 +00:00
|
|
|
#LIBS = -L/usr/local/lib -L/usr/lib `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -pg
|
2014-03-26 13:05:47 +00:00
|
|
|
#LIBS = -L/usr/local/lib -L/usr/lib $(SDL_LIBS) -lstdc++ -lz $(GLLIB) -pg
|
2017-06-22 03:57:57 +00:00
|
|
|
LIBS = $(SDL_LIBS) -lstdc++ -lz -lm $(GLLIB) -pg
|
2007-05-29 03:06:33 +00:00
|
|
|
|
2013-10-11 20:10:47 +00:00
|
|
|
#INCS = -I. -I./src -I/usr/local/include -I/usr/include
|
|
|
|
INCS = -I. -I./src
|
2007-05-29 03:06:33 +00:00
|
|
|
|
|
|
|
OBJS = \
|
2019-04-17 03:29:58 +00:00
|
|
|
obj/config.o \
|
2013-10-14 02:00:17 +00:00
|
|
|
obj/diskselector.o \
|
2014-03-25 15:45:09 +00:00
|
|
|
obj/font10pt.o \
|
|
|
|
obj/font12pt.o \
|
2013-10-14 02:00:17 +00:00
|
|
|
obj/font14pt.o \
|
2007-05-29 03:06:33 +00:00
|
|
|
obj/gui.o \
|
2017-06-05 03:28:52 +00:00
|
|
|
\
|
2019-02-26 04:06:55 +00:00
|
|
|
obj/a2hs-scsi.o \
|
|
|
|
obj/apple2-fw.o \
|
|
|
|
obj/apple2e-enh.o \
|
|
|
|
obj/firmware.o \
|
|
|
|
\
|
2017-05-18 04:17:17 +00:00
|
|
|
obj/apple2-icon-64x64.o \
|
2013-10-14 02:00:17 +00:00
|
|
|
obj/charset.o \
|
2018-09-17 02:45:27 +00:00
|
|
|
obj/crc32.o \
|
2007-05-29 03:06:33 +00:00
|
|
|
obj/dis65c02.o \
|
2019-02-09 21:42:07 +00:00
|
|
|
obj/fileio.o \
|
Misc. improvements, added WOZ file support to floppy emulation
- Refactored old MMU slot code to be more flexible
- Moved all Mockingboard related code to its own compilation unit
- Refactored old 6522 & AY-3-8910 code into v6522VIA & vAY8910 :-)
- Fixed BCD mode for ADC and SBC in v65C02
- Finally fixed text mode characters in both ALTCHARSET and regular
modes
- Added new floppy disk controller Logic State Sequencer emulation
- Fixed v65C02 to be cycle exact (as far as I can tell)
- Fixed a bunch of bugs in v65C02
- Dropped NIB support
- Added WOZ 1.0 file support
That last item is a bit of a big deal, as I had been thinking about
writing a new file format that would be bit-based--since the NIB nybble
format, while better than pretty much all the other formats out there,
fails hard in things like extra sync bits and half tracks. So, somewhat
serendipitously, I stumbled upon the Applesauce project and found out
that not only had other people been thinking in more or less the same
direction, they had created it and had made disk images to try!
So now, because of this, WOZ is the internal format used by the floppy
emulation (as opposed to NIB) which, along with the new disk Logic State
Sequencer emulator, makes it possible to format floppy disks correctly
for the first time. :-)
One ironic consequence of this is that NIB format can no longer be
properly supported. The irony comes from the fact that before there was
LSS emulation, NIB was the most accurate format you could get to
represent the low level format of a disk, but now, with proper LSS
emulation, it's the worst format for representing a floppy disk. And
the main reason for this is that NIB doesn't contain sync bits, and has
no mechanism to represent them--so when feeding them to the new LSS
emulation, they will fail horribly because without sync bits, the
bitstream represented by a NIB formatted disk can and will be
misinterpreted by the LSS. And since there is now a format that
properly represents the bitstream on a floppy disk (WOZ), there's
absolutely no reason to keep NIB around or support it anymore. While it
was a nice interim format to have around (when the emulation of the disk
was "imperfectly perfect"), it now no longer has a place in disk
preservation and/or emulation.
Another consequence of this new format is that Apple2 only supports
writing of WOZ images--it will no longer support writing of DSK and its
bretheren. However, since those formats are extremely limited in their
scope (they literally only represented the contents of the sectors on a
disk) we still support reading them; Apple2 will automagically upconvert
them and save them as WOZs (it will use the same filename but substitute
"woz" for the old extension). So if you're wondering why your DSKs are
unchanged when saving to them, you now know why. :-)
Big, big thanks to the Applesauce guys and everyone who contributed and
continues to contribute to that project; your efforts are very much
appreciated--you guys are awesome!
2019-01-24 02:33:05 +00:00
|
|
|
obj/floppydrive.o \
|
2019-02-07 13:46:21 +00:00
|
|
|
obj/harddrive.o \
|
2007-05-29 03:06:33 +00:00
|
|
|
obj/log.o \
|
2013-09-28 23:15:54 +00:00
|
|
|
obj/mmu.o \
|
Misc. improvements, added WOZ file support to floppy emulation
- Refactored old MMU slot code to be more flexible
- Moved all Mockingboard related code to its own compilation unit
- Refactored old 6522 & AY-3-8910 code into v6522VIA & vAY8910 :-)
- Fixed BCD mode for ADC and SBC in v65C02
- Finally fixed text mode characters in both ALTCHARSET and regular
modes
- Added new floppy disk controller Logic State Sequencer emulation
- Fixed v65C02 to be cycle exact (as far as I can tell)
- Fixed a bunch of bugs in v65C02
- Dropped NIB support
- Added WOZ 1.0 file support
That last item is a bit of a big deal, as I had been thinking about
writing a new file format that would be bit-based--since the NIB nybble
format, while better than pretty much all the other formats out there,
fails hard in things like extra sync bits and half tracks. So, somewhat
serendipitously, I stumbled upon the Applesauce project and found out
that not only had other people been thinking in more or less the same
direction, they had created it and had made disk images to try!
So now, because of this, WOZ is the internal format used by the floppy
emulation (as opposed to NIB) which, along with the new disk Logic State
Sequencer emulator, makes it possible to format floppy disks correctly
for the first time. :-)
One ironic consequence of this is that NIB format can no longer be
properly supported. The irony comes from the fact that before there was
LSS emulation, NIB was the most accurate format you could get to
represent the low level format of a disk, but now, with proper LSS
emulation, it's the worst format for representing a floppy disk. And
the main reason for this is that NIB doesn't contain sync bits, and has
no mechanism to represent them--so when feeding them to the new LSS
emulation, they will fail horribly because without sync bits, the
bitstream represented by a NIB formatted disk can and will be
misinterpreted by the LSS. And since there is now a format that
properly represents the bitstream on a floppy disk (WOZ), there's
absolutely no reason to keep NIB around or support it anymore. While it
was a nice interim format to have around (when the emulation of the disk
was "imperfectly perfect"), it now no longer has a place in disk
preservation and/or emulation.
Another consequence of this new format is that Apple2 only supports
writing of WOZ images--it will no longer support writing of DSK and its
bretheren. However, since those formats are extremely limited in their
scope (they literally only represented the contents of the sectors on a
disk) we still support reading them; Apple2 will automagically upconvert
them and save them as WOZs (it will use the same filename but substitute
"woz" for the old extension). So if you're wondering why your DSKs are
unchanged when saving to them, you now know why. :-)
Big, big thanks to the Applesauce guys and everyone who contributed and
continues to contribute to that project; your efforts are very much
appreciated--you guys are awesome!
2019-01-24 02:33:05 +00:00
|
|
|
obj/mockingboard.o \
|
2007-05-29 03:06:33 +00:00
|
|
|
obj/settings.o \
|
|
|
|
obj/sound.o \
|
|
|
|
obj/timing.o \
|
Misc. improvements, added WOZ file support to floppy emulation
- Refactored old MMU slot code to be more flexible
- Moved all Mockingboard related code to its own compilation unit
- Refactored old 6522 & AY-3-8910 code into v6522VIA & vAY8910 :-)
- Fixed BCD mode for ADC and SBC in v65C02
- Finally fixed text mode characters in both ALTCHARSET and regular
modes
- Added new floppy disk controller Logic State Sequencer emulation
- Fixed v65C02 to be cycle exact (as far as I can tell)
- Fixed a bunch of bugs in v65C02
- Dropped NIB support
- Added WOZ 1.0 file support
That last item is a bit of a big deal, as I had been thinking about
writing a new file format that would be bit-based--since the NIB nybble
format, while better than pretty much all the other formats out there,
fails hard in things like extra sync bits and half tracks. So, somewhat
serendipitously, I stumbled upon the Applesauce project and found out
that not only had other people been thinking in more or less the same
direction, they had created it and had made disk images to try!
So now, because of this, WOZ is the internal format used by the floppy
emulation (as opposed to NIB) which, along with the new disk Logic State
Sequencer emulator, makes it possible to format floppy disks correctly
for the first time. :-)
One ironic consequence of this is that NIB format can no longer be
properly supported. The irony comes from the fact that before there was
LSS emulation, NIB was the most accurate format you could get to
represent the low level format of a disk, but now, with proper LSS
emulation, it's the worst format for representing a floppy disk. And
the main reason for this is that NIB doesn't contain sync bits, and has
no mechanism to represent them--so when feeding them to the new LSS
emulation, they will fail horribly because without sync bits, the
bitstream represented by a NIB formatted disk can and will be
misinterpreted by the LSS. And since there is now a format that
properly represents the bitstream on a floppy disk (WOZ), there's
absolutely no reason to keep NIB around or support it anymore. While it
was a nice interim format to have around (when the emulation of the disk
was "imperfectly perfect"), it now no longer has a place in disk
preservation and/or emulation.
Another consequence of this new format is that Apple2 only supports
writing of WOZ images--it will no longer support writing of DSK and its
bretheren. However, since those formats are extremely limited in their
scope (they literally only represented the contents of the sectors on a
disk) we still support reading them; Apple2 will automagically upconvert
them and save them as WOZs (it will use the same filename but substitute
"woz" for the old extension). So if you're wondering why your DSKs are
unchanged when saving to them, you now know why. :-)
Big, big thanks to the Applesauce guys and everyone who contributed and
continues to contribute to that project; your efforts are very much
appreciated--you guys are awesome!
2019-01-24 02:33:05 +00:00
|
|
|
obj/v6522via.o \
|
2007-05-29 03:06:33 +00:00
|
|
|
obj/v65c02.o \
|
Misc. improvements, added WOZ file support to floppy emulation
- Refactored old MMU slot code to be more flexible
- Moved all Mockingboard related code to its own compilation unit
- Refactored old 6522 & AY-3-8910 code into v6522VIA & vAY8910 :-)
- Fixed BCD mode for ADC and SBC in v65C02
- Finally fixed text mode characters in both ALTCHARSET and regular
modes
- Added new floppy disk controller Logic State Sequencer emulation
- Fixed v65C02 to be cycle exact (as far as I can tell)
- Fixed a bunch of bugs in v65C02
- Dropped NIB support
- Added WOZ 1.0 file support
That last item is a bit of a big deal, as I had been thinking about
writing a new file format that would be bit-based--since the NIB nybble
format, while better than pretty much all the other formats out there,
fails hard in things like extra sync bits and half tracks. So, somewhat
serendipitously, I stumbled upon the Applesauce project and found out
that not only had other people been thinking in more or less the same
direction, they had created it and had made disk images to try!
So now, because of this, WOZ is the internal format used by the floppy
emulation (as opposed to NIB) which, along with the new disk Logic State
Sequencer emulator, makes it possible to format floppy disks correctly
for the first time. :-)
One ironic consequence of this is that NIB format can no longer be
properly supported. The irony comes from the fact that before there was
LSS emulation, NIB was the most accurate format you could get to
represent the low level format of a disk, but now, with proper LSS
emulation, it's the worst format for representing a floppy disk. And
the main reason for this is that NIB doesn't contain sync bits, and has
no mechanism to represent them--so when feeding them to the new LSS
emulation, they will fail horribly because without sync bits, the
bitstream represented by a NIB formatted disk can and will be
misinterpreted by the LSS. And since there is now a format that
properly represents the bitstream on a floppy disk (WOZ), there's
absolutely no reason to keep NIB around or support it anymore. While it
was a nice interim format to have around (when the emulation of the disk
was "imperfectly perfect"), it now no longer has a place in disk
preservation and/or emulation.
Another consequence of this new format is that Apple2 only supports
writing of WOZ images--it will no longer support writing of DSK and its
bretheren. However, since those formats are extremely limited in their
scope (they literally only represented the contents of the sectors on a
disk) we still support reading them; Apple2 will automagically upconvert
them and save them as WOZs (it will use the same filename but substitute
"woz" for the old extension). So if you're wondering why your DSKs are
unchanged when saving to them, you now know why. :-)
Big, big thanks to the Applesauce guys and everyone who contributed and
continues to contribute to that project; your efforts are very much
appreciated--you guys are awesome!
2019-01-24 02:33:05 +00:00
|
|
|
obj/vay8910.o \
|
2007-05-29 03:06:33 +00:00
|
|
|
obj/video.o \
|
|
|
|
obj/apple2.o \
|
|
|
|
$(ICON)
|
|
|
|
|
2017-05-18 04:17:17 +00:00
|
|
|
all: message obj $(TARGET)$(EXESUFFIX)
|
2007-05-29 03:06:33 +00:00
|
|
|
@echo
|
2009-01-19 16:09:37 +00:00
|
|
|
@echo -e "\033[01;33m***\033[00;32m Looks like it compiled OK... Give it a whirl!\033[00m"
|
2007-05-29 03:06:33 +00:00
|
|
|
|
|
|
|
# Check the compilation environment, barf if not appropriate
|
|
|
|
|
2013-10-11 20:10:47 +00:00
|
|
|
ifeq "$(FINDSDL2)" ""
|
2017-05-18 04:17:17 +00:00
|
|
|
$(info )
|
|
|
|
$(info It seems that you don't have the SDL 2 development libraries installed. If you)
|
|
|
|
$(info have installed them, make sure that the sdl2-config file is somewhere in your)
|
|
|
|
$(info path and is executable.)
|
|
|
|
$(info )
|
|
|
|
$(error SDL2 MISSING)
|
2007-05-29 03:06:33 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
message:
|
|
|
|
@echo
|
2009-01-19 16:09:37 +00:00
|
|
|
@echo -e "\033[01;33m***\033[00;32m Building Apple2 SDL for $(MSG)...\033[00m"
|
2007-05-29 03:06:33 +00:00
|
|
|
@echo
|
|
|
|
|
|
|
|
clean:
|
2009-01-19 16:09:37 +00:00
|
|
|
@echo -en "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"
|
2007-05-29 03:06:33 +00:00
|
|
|
@rm -rf obj
|
|
|
|
@rm -f ./$(TARGET)$(EXESUFFIX)
|
2009-01-19 16:09:37 +00:00
|
|
|
@echo -e "\033[01;37mdone!\033[00m"
|
2007-05-29 03:06:33 +00:00
|
|
|
|
|
|
|
obj:
|
|
|
|
@mkdir obj
|
|
|
|
|
2017-05-18 04:17:17 +00:00
|
|
|
# Icon creation is only done for Win32 at the moment...
|
2007-05-29 03:06:33 +00:00
|
|
|
ifneq "" "$(ICON)"
|
|
|
|
$(ICON): res/$(TARGET).rc res/$(TARGET).ico
|
2009-01-19 16:09:37 +00:00
|
|
|
@echo -e "\033[01;33m***\033[00;32m Processing icon...\033[00m"
|
2013-10-11 20:10:47 +00:00
|
|
|
@$(CROSS)windres -i res/$(TARGET).rc -o $(ICON) --include-dir=./res
|
2007-05-29 03:06:33 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
obj/%.o: src/%.c
|
2009-01-19 16:09:37 +00:00
|
|
|
@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
|
2007-05-29 03:06:33 +00:00
|
|
|
@$(CC) $(CFLAGS) $(INCS) -c $< -o $@
|
|
|
|
|
|
|
|
obj/%.o: src/%.cpp
|
2009-01-19 16:09:37 +00:00
|
|
|
@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
|
2007-05-29 03:06:33 +00:00
|
|
|
@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
|
|
|
|
|
|
|
|
#GUI compilation...
|
2017-06-02 02:42:15 +00:00
|
|
|
obj/%.o: src/gui/%.cpp
|
|
|
|
@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
|
|
|
|
@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
|
2007-05-29 03:06:33 +00:00
|
|
|
|
2019-02-26 04:06:55 +00:00
|
|
|
#Firmware compilation...
|
|
|
|
obj/%.o: src/firmware/%.cpp
|
|
|
|
@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
|
|
|
|
@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
|
|
|
|
|
2007-05-29 03:06:33 +00:00
|
|
|
$(TARGET)$(EXESUFFIX): $(OBJS)
|
2009-01-19 16:09:37 +00:00
|
|
|
@echo -e "\033[01;33m***\033[00;32m Linking it all together...\033[00m"
|
2014-04-01 13:47:16 +00:00
|
|
|
@$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
|
2017-05-18 04:17:17 +00:00
|
|
|
# strip --strip-all $(TARGET)$(EXESUFFIX)
|
|
|
|
# upx -9 $(TARGET)$(EXESUFFIX)
|
2007-05-29 03:06:33 +00:00
|
|
|
|
2013-10-06 17:17:38 +00:00
|
|
|
statistics:
|
|
|
|
@echo -n "Lines in source files: "
|
|
|
|
@-$(FIND) ./src -name "*.cpp" | xargs cat | wc -l
|
|
|
|
@echo -n "Lines in header files: "
|
|
|
|
@-$(FIND) ./src -name "*.h" | xargs cat | wc -l
|
|
|
|
|
2007-05-29 03:06:33 +00:00
|
|
|
# Pull in dependencies autogenerated by gcc's -MMD switch
|
|
|
|
# The "-" in front in there just in case they haven't been created yet
|
|
|
|
|
|
|
|
-include obj/*.d
|
2013-09-09 02:18:23 +00:00
|
|
|
|