Added floppy #2 saving, statistics to makefile.

This commit is contained in:
Shamus Hammons 2013-10-06 12:17:38 -05:00
parent 6b21449d90
commit f36d026c7b
54 changed files with 13 additions and 1 deletions

8
Makefile Executable file → Normal file
View File

@ -6,6 +6,8 @@
# This software is licensed under the GPL v2
#
FIND = find
# Figure out which system we're compiling for, and set the appropriate variables
ifeq "$(OSTYPE)" "msys" # Win32
@ -159,6 +161,12 @@ $(TARGET)$(EXESUFFIX): $(OBJS)
# strip --strip-all vj$(EXESUFFIX)
# upx -9 vj$(EXESUFFIX)
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
# Pull in dependencies autogenerated by gcc's -MMD switch
# The "-" in front in there just in case they haven't been created yet

0
apple2.cfg Executable file → Normal file
View File

0
docs/gpl.txt Executable file → Normal file
View File

0
res/apple2.ico Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
res/apple2.rc Executable file → Normal file
View File

3
src/apple2.cpp Executable file → Normal file
View File

@ -1531,7 +1531,8 @@ SDL_DestroySemaphore(mainSem);
// Save state here...
SaveApple2State(settings.autoStatePath);
}
floppyDrive.SaveImage();
floppyDrive.SaveImage(0);
floppyDrive.SaveImage(1);
SoundDone();
VideoDone();

0
src/apple2.h Executable file → Normal file
View File

0
src/applevideo.cpp Executable file → Normal file
View File

0
src/applevideo.h Executable file → Normal file
View File

0
src/ay8910.cpp Executable file → Normal file
View File

0
src/ay8910.h Executable file → Normal file
View File

0
src/charset.h Executable file → Normal file
View File

0
src/dis65c02.cpp Executable file → Normal file
View File

0
src/dis65c02.h Executable file → Normal file
View File

0
src/fd-img-128x128.c Executable file → Normal file
View File

0
src/firmware.cpp Executable file → Normal file
View File

3
src/floppy.cpp Executable file → Normal file
View File

@ -118,6 +118,7 @@ bool FloppyDrive::LoadImage(const char * filename, uint8_t driveNum/*= 0*/)
bool FloppyDrive::SaveImage(uint8_t driveNum/*= 0*/)
{
// Various sanity checks...
if (driveNum > 1)
{
WriteLog("FLOPPY: Attempted to save image to drive #%u!\n", driveNum);
@ -136,11 +137,13 @@ bool FloppyDrive::SaveImage(uint8_t driveNum/*= 0*/)
return false;
}
// Handle nybbylization, if necessary
if (diskType[driveNum] == DT_NYBBLE)
memcpy(disk[driveNum], nybblizedImage[driveNum], 232960);
else
DenybblizeImage(driveNum);
// Finally, write the damn image
FILE * fp = fopen(imageName[driveNum], "wb");
if (fp == NULL)

0
src/floppy.h Executable file → Normal file
View File

0
src/font14pt.h Executable file → Normal file
View File

0
src/gui/button.cpp Executable file → Normal file
View File

0
src/gui/button.h Executable file → Normal file
View File

0
src/gui/draggablewindow.cpp Executable file → Normal file
View File

0
src/gui/draggablewindow.h Executable file → Normal file
View File

0
src/gui/draggablewindow2.cpp Executable file → Normal file
View File

0
src/gui/draggablewindow2.h Executable file → Normal file
View File

0
src/gui/element.cpp Executable file → Normal file
View File

0
src/gui/element.h Executable file → Normal file
View File

0
src/gui/font1.h Executable file → Normal file
View File

0
src/gui/font14pt.h Executable file → Normal file
View File

0
src/gui/gui.cpp Executable file → Normal file
View File

0
src/gui/gui.h Executable file → Normal file
View File

0
src/gui/guielements.h Executable file → Normal file
View File

0
src/gui/guimisc.cpp Executable file → Normal file
View File

0
src/gui/guimisc.h Executable file → Normal file
View File

0
src/gui/menu.cpp Executable file → Normal file
View File

0
src/gui/menu.h Executable file → Normal file
View File

0
src/gui/textedit.cpp Executable file → Normal file
View File

0
src/gui/textedit.h Executable file → Normal file
View File

0
src/gui/window.cpp Executable file → Normal file
View File

0
src/gui/window.h Executable file → Normal file
View File

0
src/log.cpp Executable file → Normal file
View File

0
src/log.h Executable file → Normal file
View File

0
src/sdlemu_config.cpp Executable file → Normal file
View File

0
src/sdlemu_config.h Executable file → Normal file
View File

0
src/settings.cpp Executable file → Normal file
View File

0
src/settings.h Executable file → Normal file
View File

0
src/sound.cpp Executable file → Normal file
View File

0
src/sound.h Executable file → Normal file
View File

0
src/timing.cpp Executable file → Normal file
View File

0
src/timing.h Executable file → Normal file
View File

0
src/v65c02.cpp Executable file → Normal file
View File

0
src/v65c02.h Executable file → Normal file
View File

0
src/video.cpp Executable file → Normal file
View File

0
src/video.h Executable file → Normal file
View File