|
From: <bla...@us...> - 2008-07-04 23:48:16
|
Revision: 18962
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18962&view=rev
Author: blackystardust
Date: 2008-07-04 16:48:22 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Updated to 1.22.23
Modified Paths:
--------------
branches/marco/ports/vice/ChangeLog
branches/marco/ports/vice/Makefile.am
branches/marco/ports/vice/configure.in
branches/marco/ports/vice/doc/html/Makefile.am
branches/marco/ports/vice/doc/html/plain/BUGS
branches/marco/ports/vice/doc/html/plain/NEWS
branches/marco/ports/vice/src/ChangeLog
branches/marco/ports/vice/src/arch/unix/archdep.c
branches/marco/ports/vice/src/arch/unix/macosx/Makefile.am
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
branches/marco/ports/vice/src/arch/unix/tfearch.c
branches/marco/ports/vice/src/arch/win32/Makefile.am
branches/marco/ports/vice/src/arch/win32/base.dsp
branches/marco/ports/vice/src/arch/win32/ui.c
branches/marco/ports/vice/src/arch/win32/uikeyboard.c
branches/marco/ports/vice/src/arch/win32/vice.dsw
branches/marco/ports/vice/src/c64/ramcart.c
branches/marco/ports/vice/src/c64/reu.c
branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c
branches/marco/ports/vice/src/lib.c
branches/marco/ports/vice/src/lib.h
branches/marco/ports/vice/src/screenshot.c
branches/marco/ports/vice/src/sound.h
branches/marco/ports/vice/src/version.h
Added Paths:
-----------
branches/marco/ports/vice/src/arch/win32/_vice.dsp
Removed Paths:
-------------
branches/marco/ports/vice/src/arch/win32/_all.dsp
branches/marco/ports/vice/src/arch/win32/vice.dsp
Modified: branches/marco/ports/vice/ChangeLog
===================================================================
--- branches/marco/ports/vice/ChangeLog 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/ChangeLog 2008-07-04 23:48:22 UTC (rev 18962)
@@ -1,3 +1,24 @@
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.23
+
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * Makefile.am: Make sure the file Doxyfile is included in the
+ distribution.
+
+ * doc/html/Makefile.am: Make sure the files hpux.html and
+ sco.html are included in the distribution.
+
+2008-07-01 Marco van den Heuvel <bla...@ya...>
+
+ * doc/GP2X-Howto.txt, doc/Makefile.am: Added a GP2X compile
+ howto text file.
+
+2008-07-02 Andreas Matthies <and...@gm...>
+
+ * doc/html/plain/BUGS, NEWS: Updated.
+
2008-07-01 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.22
Modified: branches/marco/ports/vice/Makefile.am
===================================================================
--- branches/marco/ports/vice/Makefile.am 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/Makefile.am 2008-07-04 23:48:22 UTC (rev 18962)
@@ -2,7 +2,14 @@
SUBDIRS = $(POSUB) src build data man doc
-EXTRA_DIST = AUTHORS FEEDBACK COPYING INSTALL NEWS vice.spec vice-mint.spec
+EXTRA_DIST = AUTHORS \
+ FEEDBACK \
+ COPYING \
+ Doxyfile \
+ INSTALL \
+ NEWS \
+ vice.spec \
+ vice-mint.spec
.PHONY: x64 x128 xvic xpet xplus4 xcbm2
x64:
Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/configure.in 2008-07-04 23:48:22 UTC (rev 18962)
@@ -9,7 +9,7 @@
VICE_VERSION_MAJOR=1
VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=22
+VICE_VERSION_BUILD=23
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
Modified: branches/marco/ports/vice/doc/html/Makefile.am
===================================================================
--- branches/marco/ports/vice/doc/html/Makefile.am 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/doc/html/Makefile.am 2008-07-04 23:48:22 UTC (rev 18962)
@@ -9,6 +9,7 @@
images/new.gif \
images/vice-logo.jpg \
index.html \
+ hpux.html \
macosx.html \
plain/64doc.txt \
plain/BUGS \
@@ -21,6 +22,7 @@
plain/drive_info.txt \
plain/serial.txt \
qnx.html \
+ sco.html \
solaris.html \
vice_1.html \
vice_2.html \
Modified: branches/marco/ports/vice/doc/html/plain/BUGS
===================================================================
--- branches/marco/ports/vice/doc/html/plain/BUGS 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/doc/html/plain/BUGS 2008-07-04 23:48:22 UTC (rev 18962)
@@ -1,3 +1,6 @@
+- IRQ acknowledge handling is buggy. Visible in e.g.
+ Charlatan/Beyond Force, Enforcer, Bandits (VIC20).
+
- Xaw UI context popup menu for drive attach is broken if more than
two drives are active.
Modified: branches/marco/ports/vice/doc/html/plain/NEWS
===================================================================
--- branches/marco/ports/vice/doc/html/plain/NEWS 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/doc/html/plain/NEWS 2008-07-04 23:48:22 UTC (rev 18962)
@@ -41,6 +41,16 @@
- Improved REU compatibility
+- Fixed CPU timing bug introduced in 1.22 (demo "Borderless").
+
+- Fixed bugs in the CIA emulation (demo "So-phisticated",
+ W. Lorenz testsuite).
+
+- Fixed various bugs in VIC-II emulation: Sprite x-positioning,
+ Latch X/Y, video mode changes, DEN bit handling, raster IRQ,
+ NTSC sprites and sprites in full/debugging border mode (list
+ of fixed demos/games too long to mention here).
+
** VIC20 changes
----------------
@@ -87,6 +97,14 @@
- allow for pasting into the VICE window: Either via menu
(Edit/Paste), or by right-clicking on the VICE window.
+- keyboard shortcuts are definable in the configuration file
+ win_shortscuts.vsc
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
+- Fixed volume slider behaviour when switching fullscreen mode.
+
** BeOS changes
---------------
@@ -120,7 +138,9 @@
- New memmap feature which allows tracking of memory accesses,
activated by the configure option --enable-memmap.
+- Fixed bug in ffmpeg/FFV1 driver. Should be really lossless now.
+
* Changes in VICE 1.22
======================
Modified: branches/marco/ports/vice/src/ChangeLog
===================================================================
--- branches/marco/ports/vice/src/ChangeLog 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/ChangeLog 2008-07-04 23:48:22 UTC (rev 18962)
@@ -1,3 +1,99 @@
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.23
+
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * arch/win32/Makefile.am: Removed vice.dsp
+
+ * arch/win32/vice.dsw: Removed vice.dsp
+
+ * c64/ramcart.c: Include vicii-phi1.h for vicii_read_phi1().
+
+ * clipboard.c: Define for variable i as unsigned to prevent a
+ warning.
+
+ * arch/win32/base.dsp: Add clipboard.c so vice compiles again.
+
+ * sound.h: changed SWORD sound_audio_mix(SWORD ch1, SWORD ch2);
+ to SWORD sound_audio_mix(int ch1, int ch2).
+
+ * gfxoutputdrv/bmpdrv.c: bmpdrv_write_memmap() now is a void
+ function.
+
+ * screenshot.c: memmap_screenshot_save() had an unused variable
+ i, removed that.
+
+ * lib.c, lib.h: lib_free() now takes a const pointer.
+
+ * arch/unix/archdep.c: viceuserdir is now a const pointer.
+
+ * arch/unix/tfearch.c: Removed unused TfePcapCloseAdapter()
+ function.
+
+2008-07-04 Marco van den Heuvel <bla...@ya...>
+
+ * Makefile.am, arch/win32/ui.c, clipboard.c, clipboard.h: Moved
+ the common clipboard code that Spiro made to the new common
+ files called 'clipboard.c' and 'clipboard.h'.
+
+ * arch/amigaos/c128uires.h, arch/amigaos/c64uires.h,
+ arch/amigaos/cbm2uires.h, arch/amigaos/intl.c,
+ arch/amigaos/intl.txt, arch/amigaos/petuires.h,
+ arch/amigaos/plus4uires.h, arch/amigaos/private.h,
+ arch/amigaos/ui.c, arch/amigaos/uires.h,
+ arch/amigaos/vic20uires.h: Added text-only copy and paste
+ support to the amiga ports.
+
+ * arch/amigaos/joyai.c: Corrected some typos.
+
+ * arch/amigaos/video.c: Fixed a wrongly placed #endif.
+
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * arch/unix/macosx/Makefile.am: Make sure the file
+ VICE.xcodeproj/project.pbxproj is included in the source
+ distribution.
+
+ * arch/unix/macosx/Resources/English.lproj/Makefile.am: Make
+ sure some MacOS files are included in the source distribution.
+
+2008-07-01 Marco van den Heuvel <bla...@ya...>
+
+ * arch/win32/ui.c, c128/c128mem.c, c64/c64mem.c, cbm2/cbm2mem.c,
+ mem.h, monitor/monitor.c, pet/petmem.c, plus4/plus4mem.c,
+ vic20/vic20mem.c: Fixed the returned values of the
+ mem_get_screen_parameter() of some of the emulators, and added a
+ bank parameter to the mem_get_screen_parameter() function, this
+ was needed to get it to work for xcbm2.
+
+ * sound.h: Added a static inline 2-channel digital audio mixing
+ routine.
+
+ * c64/digimax.c, pet/petsound.c, plus4/ted-sound.c,
+ vic20/vic20sound.c: Fixed to use proper digital audio mixing.
+
+2008-07-02 Spiro Trikaliotis <spi...@gm...>
+
+ * arch/win32/Makefile.am: Renamed _all.dsp to _vice.dsp
+
+ * arch/win32/_all.dsp, arch/win32/_vice.dsp: renamed _all.dsp to
+ _vice.dsp.
+
+2008-07-02 Andreas Matthies <and...@gm...>
+
+ * arch/win32/ui.c: Moved creation of accelerators to
+ ui_init_finish.
+
+ * arch/win32/uikeyboard.c: Log a warning if the shortcut file
+ cannot be opened.
+
+2008-07-02 Spiro Trikaliotis <spi...@gm...>
+
+ * arch/win32/Makefile.am: Added new file _all.dsp.
+
+ * c64/reu.c: The banking register has a shadow register, too.
+
2008-07-01 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.22
Modified: branches/marco/ports/vice/src/arch/unix/archdep.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/archdep.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/unix/archdep.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -260,7 +260,7 @@
{
char *fname;
const char *home;
- char *viceuserdir;
+ const char *viceuserdir;
if(archdep_pref_path==NULL) {
home = archdep_home_path();
Modified: branches/marco/ports/vice/src/arch/unix/macosx/Makefile.am
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Makefile.am 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Makefile.am 2008-07-04 23:48:22 UTC (rev 18962)
@@ -27,4 +27,5 @@
Info.plist \
make-bindist.sh \
x11-launcher.sh \
- vice-launcher.sh
+ vice-launcher.sh \
+ VICE.xcodeproj/project.pbxproj
Modified: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am 2008-07-04 23:48:22 UTC (rev 18962)
@@ -16,10 +16,16 @@
PrinterSettings.nib/keyedobjects.nib \
KeyboardSettings.nib/classes.nib \
KeyboardSettings.nib/info.nib \
- KeyboardSettings.nib/keyedobjects.nib
+ KeyboardSettings.nib/keyedobjects.nib \
JoystickSettings.nib/classes.nib \
JoystickSettings.nib/info.nib \
JoystickSettings.nib/keyedobjects.nib \
+ RecordMedia.nib/classes.nib \
+ RecordMedia.nib/info.nib \
ResourceEditor.nib/classes.nib \
ResourceEditor.nib/info.nib \
- ResourceEditor.nib/keyedobjects.nib
+ ResourceEditor.nib/keyedobjects.nib \
+ ResourceTree.plist \
+ SoundSettings.nib/classes.nib \
+ SoundSettings.nib/info.nib \
+ SoundSettings.nib/keyedobjects.nib
Modified: branches/marco/ports/vice/src/arch/unix/tfearch.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/tfearch.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/unix/tfearch.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -96,6 +96,7 @@
#endif // #ifdef TFE_DEBUG_PKTDUMP
+#if 0
static
void TfePcapCloseAdapter(void)
{
@@ -109,6 +110,7 @@
TfePcapFP = NULL;
}
}
+#endif
/*
These functions let the UI enumerate the available interfaces.
Modified: branches/marco/ports/vice/src/arch/win32/Makefile.am
===================================================================
--- branches/marco/ports/vice/src/arch/win32/Makefile.am 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/Makefile.am 2008-07-04 23:48:22 UTC (rev 18962)
@@ -307,6 +307,7 @@
watcom/xplus4main.c \
watcom/xvic.tgt \
watcom/xvicmain.c \
+ _vice.dsp \
arch.dsp \
base.dsp \
c128.dsp \
@@ -358,7 +359,6 @@
vdc.dsp \
vdrive.dsp \
vic20.dsp \
- vice.dsp \
vicii.dsp \
video.dsp \
x128.dsp \
Deleted: branches/marco/ports/vice/src/arch/win32/_all.dsp
===================================================================
--- branches/marco/ports/vice/src/arch/win32/_all.dsp 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/_all.dsp 2008-07-04 23:48:22 UTC (rev 18962)
@@ -1,89 +0,0 @@
-# Microsoft Developer Studio Project File - Name="_all" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=_all - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "_all.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "_all.mak" CFG="_all - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "_all - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "_all - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "_all - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-
-!ELSEIF "$(CFG)" == "_all - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "_all - Win32 Release"
-# Name "_all - Win32 Debug"
-# End Target
-# End Project
Copied: branches/marco/ports/vice/src/arch/win32/_vice.dsp (from rev 18961, tags/v1.22/v1.22.23/vice/src/arch/win32/_vice.dsp)
===================================================================
--- branches/marco/ports/vice/src/arch/win32/_vice.dsp (rev 0)
+++ branches/marco/ports/vice/src/arch/win32/_vice.dsp 2008-07-04 23:48:22 UTC (rev 18962)
@@ -0,0 +1,89 @@
+# Microsoft Developer Studio Project File - Name="_vice" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=_vice - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "_vice.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "_vice.mak" CFG="_vice - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "_vice - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "_vice - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "_vice - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF "$(CFG)" == "_vice - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "_vice - Win32 Release"
+# Name "_vice - Win32 Debug"
+# End Target
+# End Project
Modified: branches/marco/ports/vice/src/arch/win32/base.dsp
===================================================================
--- branches/marco/ports/vice/src/arch/win32/base.dsp 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/base.dsp 2008-07-04 23:48:22 UTC (rev 18962)
@@ -140,6 +140,10 @@
# End Source File
# Begin Source File
+SOURCE="..\..\clipboard.c"
+# End Source File
+# Begin Source File
+
SOURCE="..\..\clkguard.c"
# End Source File
# Begin Source File
Modified: branches/marco/ports/vice/src/arch/win32/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/win32/ui.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/ui.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -258,8 +258,6 @@
emu_menu = IDR_MENUC64;
}
- ui_accelerator = uikeyboard_create_accelerator_table();
-
/* Register the window class. */
window_class.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
window_class.lpfnWndProc = window_proc;
@@ -325,6 +323,7 @@
/* Initialize the UI after setting all the resource values. */
int ui_init_finish(void)
{
+ ui_accelerator = uikeyboard_create_accelerator_table();
ui_fullscreen_init();
atexit(ui_exit);
return 0;
Modified: branches/marco/ports/vice/src/arch/win32/uikeyboard.c
===================================================================
--- branches/marco/ports/vice/src/arch/win32/uikeyboard.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/uikeyboard.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -48,6 +48,7 @@
#include "intl.h"
#include "keyboard.h"
#include "lib.h"
+#include "log.h"
#include "res.h"
#include "resources.h"
#include "sysfile.h"
@@ -265,8 +266,10 @@
fshortcuts = sysfile_open("win_shortcuts.vsc", &complete_path, MODE_READ_TEXT);
lib_free(complete_path);
- if (fshortcuts == NULL)
+ if (fshortcuts == NULL) {
+ log_error(LOG_DEFAULT, "Warning. Cannot open keyboard shortcut file win_shortcuts.vsc.");
return NULL;
+ }
/* read the shortcut table */
do {
@@ -336,35 +339,6 @@
}
-#if 0
-void uikeyboard_menu_shortcuts(HMENU menu)
-{
- int i;
- MENUITEMINFO mii;
- LPTSTR buf, newbuf;
-
- for (i = 0; idmlist[i].cmd > 0; i++) {
- if (menuitemmodifier[idmlist[i].cmd] != NULL) {
- mii.fMask = MIIM_STRING;
- mii.dwTypeData = NULL;
- mii.cbSize = sizeof(MENUITEMINFO);
- if (GetMenuItemInfo(menu, idmlist[i].cmd, FALSE, &mii)) {
- mii.cch++;
- buf = lib_malloc(mii.cch);
- mii.dwTypeData = buf;
- if (GetMenuItemInfo(menu, idmlist[i].cmd, FALSE, &mii)) {
- newbuf = util_concat(buf, menuitemmodifier[idmlist[i].cmd], NULL);
- mii.dwTypeData = newbuf;
- SetMenuItemInfo(menu, idmlist[i].cmd, FALSE, &mii);
- lib_free(newbuf);
- }
- lib_free(buf);
- }
- }
- }
-}
-#endif
-
/* using MIIM_STRING doesn't work for win9x/winnt4, so trying an older way */
void uikeyboard_menu_shortcuts(HMENU menu)
{
Deleted: branches/marco/ports/vice/src/arch/win32/vice.dsp
===================================================================
--- branches/marco/ports/vice/src/arch/win32/vice.dsp 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/vice.dsp 2008-07-04 23:48:22 UTC (rev 18962)
@@ -1,89 +0,0 @@
-# Microsoft Developer Studio Project File - Name="vice" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=vice - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "vice.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "vice.mak" CFG="vice - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "vice - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "vice - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "vice - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-
-!ELSEIF "$(CFG)" == "vice - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "vice - Win32 Release"
-# Name "vice - Win32 Debug"
-# End Target
-# End Project
Modified: branches/marco/ports/vice/src/arch/win32/vice.dsw
===================================================================
--- branches/marco/ports/vice/src/arch/win32/vice.dsw 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/vice.dsw 2008-07-04 23:48:22 UTC (rev 18962)
@@ -3,7 +3,7 @@
###############################################################################
-Project: "_all"=".\_all.dsp" - Package Owner=<4>
+Project: "_vice"=".\_vice.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -712,47 +712,8 @@
End Project Dependency
}}}
-###############################################################################
+##############################################################################
-Project: "vice"=".\vice.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name x64
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name x128
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name xcbm2
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name xpet
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name xplus4
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name xvic
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name petcat
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name c1541
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name cartconv
- End Project Dependency
-}}}
-
-###############################################################################
-
Project: "vicii"=".\vicii.dsp" - Package Owner=<4>
Package=<5>
Modified: branches/marco/ports/vice/src/c64/ramcart.c
===================================================================
--- branches/marco/ports/vice/src/c64/ramcart.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/c64/ramcart.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -96,8 +96,8 @@
#endif
#include "types.h"
#include "util.h"
+#include "vicii-phi1.h"
-
static const c64export_resource_t export_res = {
"RAMCART", 1, 0
};
Modified: branches/marco/ports/vice/src/c64/reu.c
===================================================================
--- branches/marco/ports/vice/src/c64/reu.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/c64/reu.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -187,6 +187,7 @@
WORD base_computer_shadow; /*!< shadow register of base_computer */
WORD base_reu_shadow; /*!< shadow register of base_reu */
+ BYTE bank_reu_shadow; /*!< shadow register of bank_reu */
WORD transfer_length_shadow; /*!< shadow register of transfer_length */
};
@@ -199,7 +200,7 @@
unsigned int special_wrap_around_1700; /*!< address where the special 1700 wrap around occurs; if no 1700, the same avalue as wrap_around */
unsigned int not_backedup_addresses; /*!< beginning from this address up to wrap_around, there is no DRAM at all */
unsigned int wrap_around_mask_when_storing; /*!< mask for the wrap around of REU address when putting result back in base_reu and bank_reu */
- unsigned int reg_bank_unused; /*!< the unused bits (stuck at 1) of REU_REG_RW_BANK; for original REU, it is REU_REG_RW_BANK_UNUSED */
+ BYTE reg_bank_unused; /*!< the unused bits (stuck at 1) of REU_REG_RW_BANK; for original REU, it is REU_REG_RW_BANK_UNUSED */
BYTE status_preset; /*!< preset value for the status (can be 0 or REU_REG_R_STATUS_256K_CHIPS) */
};
@@ -486,7 +487,8 @@
rec.transfer_length =
rec.transfer_length_shadow = 0xffff;
- rec.bank_reu = rec_options.reg_bank_unused;
+ rec.bank_reu =
+ rec.bank_reu_shadow = rec_options.reg_bank_unused;
rec.int_mask_reg = REU_REG_RW_INTERRUPT_UNUSED_MASK;
@@ -677,7 +679,8 @@
break;
case REU_REG_RW_BANK:
- rec.bank_reu = byte & ~ rec_options.reg_bank_unused;
+ rec.bank_reu =
+ rec.bank_reu_shadow = byte & ~ rec_options.reg_bank_unused;
break;
case REU_REG_RW_BLOCKLEN_LOW:
@@ -910,6 +913,7 @@
else {
rec.base_computer = rec.base_computer_shadow;
rec.base_reu = rec.base_reu_shadow;
+ rec.bank_reu = rec.bank_reu_shadow;
rec.transfer_length = rec.transfer_length_shadow;
DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Autoload.") );
Modified: branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -472,7 +472,7 @@
return 0;
}
-static int bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
+static void bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
{
memcpy(bmpdrv_memmap_bmp_data + (y_size - 1 - line) * x_size, gfx+(line*x_size), x_size);
}
Modified: branches/marco/ports/vice/src/lib.c
===================================================================
--- branches/marco/ports/vice/src/lib.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/lib.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -490,8 +490,9 @@
return new_ptr;
}
-void lib_free(void *ptr)
+void lib_free(const void *constptr)
{
+ void * ptr = (void*) constptr;
#ifdef LIB_DEBUG
lib_debug_free(ptr, 1, 1);
#endif
Modified: branches/marco/ports/vice/src/lib.h
===================================================================
--- branches/marco/ports/vice/src/lib.h 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/lib.h 2008-07-04 23:48:22 UTC (rev 18962)
@@ -38,7 +38,7 @@
extern void *lib_malloc(size_t size);
extern void *lib_calloc(size_t nmemb, size_t size);
extern void *lib_realloc(void *p, size_t size);
-extern void lib_free(void *ptr);
+extern void lib_free(const void *ptr);
extern char *lib_stralloc(const char *str);
extern char *lib_msprintf(const char *fmt, ...);
Modified: branches/marco/ports/vice/src/screenshot.c
===================================================================
--- branches/marco/ports/vice/src/screenshot.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/screenshot.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -194,7 +194,6 @@
int memmap_screenshot_save(const char *drvname, const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
{
gfxoutputdrv_t *drv;
- unsigned int i;
if ((drv = gfxoutput_get_driver(drvname)) == NULL)
return -1;
Modified: branches/marco/ports/vice/src/sound.h
===================================================================
--- branches/marco/ports/vice/src/sound.h 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/sound.h 2008-07-04 23:48:22 UTC (rev 18962)
@@ -85,7 +85,7 @@
int need_attenuation;
} sound_device_t;
-static inline SWORD sound_audio_mix(SWORD ch1, SWORD ch2)
+static inline SWORD sound_audio_mix(int ch1, int ch2)
{
if (ch1 == 0)
return ch2;
Modified: branches/marco/ports/vice/src/version.h
===================================================================
--- branches/marco/ports/vice/src/version.h 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/version.h 2008-07-04 23:48:22 UTC (rev 18962)
@@ -28,11 +28,11 @@
#define __VERSION_H__
#ifndef VERSION
-#define VERSION "1.22.22"
+#define VERSION "1.22.23"
#endif
#ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,22,0
+#define VERSION_RC_NUMBER 1,22,23,0
#endif
#ifndef PACKAGE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|