vice-emu-commit Mailing List for VICE (Page 1057)
Versatile Commodore Emulator
Brought to you by:
blackystardust,
gpz
Menu
▾
▴
vice-emu-commit — Commit notifications for the source server
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
(60) |
Jun
(122) |
Jul
(148) |
Aug
(178) |
Sep
(151) |
Oct
(131) |
Nov
(208) |
Dec
(129) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(193) |
Feb
(209) |
Mar
(221) |
Apr
(243) |
May
(165) |
Jun
(168) |
Jul
(198) |
Aug
(161) |
Sep
(103) |
Oct
(98) |
Nov
(168) |
Dec
(99) |
| 2010 |
Jan
(263) |
Feb
(156) |
Mar
(57) |
Apr
(93) |
May
(85) |
Jun
(124) |
Jul
(57) |
Aug
(58) |
Sep
(113) |
Oct
(148) |
Nov
(114) |
Dec
(193) |
| 2011 |
Jan
(200) |
Feb
(207) |
Mar
(91) |
Apr
(91) |
May
(142) |
Jun
(104) |
Jul
(115) |
Aug
(137) |
Sep
(266) |
Oct
(91) |
Nov
(85) |
Dec
(186) |
| 2012 |
Jan
(98) |
Feb
(146) |
Mar
(160) |
Apr
(99) |
May
(59) |
Jun
(257) |
Jul
(84) |
Aug
(103) |
Sep
(169) |
Oct
(206) |
Nov
(90) |
Dec
(296) |
| 2013 |
Jan
(294) |
Feb
(130) |
Mar
(36) |
Apr
(14) |
May
(51) |
Jun
(74) |
Jul
(180) |
Aug
(85) |
Sep
(26) |
Oct
(45) |
Nov
(29) |
Dec
(21) |
| 2014 |
Jan
(56) |
Feb
(40) |
Mar
(57) |
Apr
(30) |
May
(31) |
Jun
(11) |
Jul
(107) |
Aug
(135) |
Sep
(142) |
Oct
(195) |
Nov
(139) |
Dec
(133) |
| 2015 |
Jan
(293) |
Feb
(161) |
Mar
(146) |
Apr
(85) |
May
(139) |
Jun
(51) |
Jul
(21) |
Aug
(24) |
Sep
(29) |
Oct
(136) |
Nov
(212) |
Dec
(118) |
| 2016 |
Jan
(119) |
Feb
(165) |
Mar
(229) |
Apr
(219) |
May
(134) |
Jun
(119) |
Jul
(134) |
Aug
(236) |
Sep
(203) |
Oct
(215) |
Nov
(300) |
Dec
(140) |
| 2017 |
Jan
(188) |
Feb
(20) |
Mar
(147) |
Apr
(198) |
May
(26) |
Jun
(21) |
Jul
(67) |
Aug
(219) |
Sep
(209) |
Oct
(194) |
Nov
(144) |
Dec
(99) |
| 2018 |
Jan
(139) |
Feb
(122) |
Mar
(116) |
Apr
(85) |
May
(232) |
Jun
(181) |
Jul
(190) |
Aug
(105) |
Sep
(92) |
Oct
(178) |
Nov
(105) |
Dec
(86) |
| 2019 |
Jan
(119) |
Feb
(79) |
Mar
(74) |
Apr
(117) |
May
(115) |
Jun
(307) |
Jul
(107) |
Aug
(131) |
Sep
(103) |
Oct
(60) |
Nov
(118) |
Dec
(70) |
| 2020 |
Jan
(114) |
Feb
(103) |
Mar
(77) |
Apr
(121) |
May
(193) |
Jun
(110) |
Jul
(214) |
Aug
(210) |
Sep
(179) |
Oct
(260) |
Nov
(237) |
Dec
(334) |
| 2021 |
Jan
(163) |
Feb
(186) |
Mar
(58) |
Apr
(81) |
May
(108) |
Jun
(175) |
Jul
(154) |
Aug
(180) |
Sep
(217) |
Oct
(204) |
Nov
(232) |
Dec
(190) |
| 2022 |
Jan
(253) |
Feb
(134) |
Mar
(229) |
Apr
(190) |
May
(125) |
Jun
(70) |
Jul
(8) |
Aug
(22) |
Sep
(19) |
Oct
(33) |
Nov
(94) |
Dec
(164) |
| 2023 |
Jan
(158) |
Feb
(366) |
Mar
(272) |
Apr
(109) |
May
(198) |
Jun
(226) |
Jul
(200) |
Aug
(94) |
Sep
(108) |
Oct
(62) |
Nov
(175) |
Dec
(116) |
| 2024 |
Jan
(35) |
Feb
(40) |
Mar
(51) |
Apr
(89) |
May
(24) |
Jun
(26) |
Jul
(53) |
Aug
(71) |
Sep
(23) |
Oct
(11) |
Nov
(22) |
Dec
(58) |
| 2025 |
Jan
(26) |
Feb
(40) |
Mar
(107) |
Apr
(39) |
May
(35) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(35) |
Oct
(28) |
Nov
(14) |
Dec
|
|
From: <ama...@us...> - 2008-08-01 21:32:15
|
Revision: 19095
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19095&view=rev
Author: amatthies
Date: 2008-08-01 21:32:15 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Updated to 2.0
Modified Paths:
--------------
branches/amatthies/current/vice/ChangeLog
branches/amatthies/current/vice/Makefile.am
branches/amatthies/current/vice/README
branches/amatthies/current/vice/build/macosx/build-vice-release.sh
branches/amatthies/current/vice/build/riscos/build-cross.sh
branches/amatthies/current/vice/configure.in
branches/amatthies/current/vice/doc/Makefile.am
branches/amatthies/current/vice/doc/Readme.beos
branches/amatthies/current/vice/doc/ReadmeMacOSX.txt
branches/amatthies/current/vice/doc/Win32-Cygwin-HOWTO.txt
branches/amatthies/current/vice/doc/html/Makefile.am
branches/amatthies/current/vice/doc/html/hpux.html
branches/amatthies/current/vice/doc/html/index.html
branches/amatthies/current/vice/doc/html/macosx.html
branches/amatthies/current/vice/doc/html/plain/BUGS
branches/amatthies/current/vice/doc/html/plain/NEWS
branches/amatthies/current/vice/doc/html/qnx.html
branches/amatthies/current/vice/doc/html/sco.html
branches/amatthies/current/vice/doc/vice.texi
branches/amatthies/current/vice/po/ChangeLog
branches/amatthies/current/vice/po/de.po
branches/amatthies/current/vice/po/fr.po
branches/amatthies/current/vice/po/hu.po
branches/amatthies/current/vice/po/it.po
branches/amatthies/current/vice/po/nl.po
branches/amatthies/current/vice/po/pl.po
branches/amatthies/current/vice/po/sv.po
branches/amatthies/current/vice/src/ChangeLog
branches/amatthies/current/vice/src/Makefile.am
branches/amatthies/current/vice/src/arch/amigaos/README.AMIGA
branches/amatthies/current/vice/src/arch/amigaos/c128uires.h
branches/amatthies/current/vice/src/arch/amigaos/c64uires.h
branches/amatthies/current/vice/src/arch/amigaos/cbm2uires.h
branches/amatthies/current/vice/src/arch/amigaos/intl.c
branches/amatthies/current/vice/src/arch/amigaos/intl.txt
branches/amatthies/current/vice/src/arch/amigaos/joyai.c
branches/amatthies/current/vice/src/arch/amigaos/petuires.h
branches/amatthies/current/vice/src/arch/amigaos/plus4uires.h
branches/amatthies/current/vice/src/arch/amigaos/private.h
branches/amatthies/current/vice/src/arch/amigaos/ui.c
branches/amatthies/current/vice/src/arch/amigaos/uires.h
branches/amatthies/current/vice/src/arch/amigaos/vic20uires.h
branches/amatthies/current/vice/src/arch/amigaos/video.c
branches/amatthies/current/vice/src/arch/beos/Makefile.am
branches/amatthies/current/vice/src/arch/beos/console.c
branches/amatthies/current/vice/src/arch/beos/constants.h
branches/amatthies/current/vice/src/arch/beos/ui.cc
branches/amatthies/current/vice/src/arch/beos/ui_file.cc
branches/amatthies/current/vice/src/arch/beos/ui_sid.cc
branches/amatthies/current/vice/src/arch/beos/vicemenu.cc
branches/amatthies/current/vice/src/arch/os2/ui.c
branches/amatthies/current/vice/src/arch/os2/vac++/incl/mainsrc.icc
branches/amatthies/current/vice/src/arch/os2/watcom/mainsrc.tgt
branches/amatthies/current/vice/src/arch/os2/watcom/vice.wpj
branches/amatthies/current/vice/src/arch/unix/archdep.c
branches/amatthies/current/vice/src/arch/unix/gp2x/make-bindist.sh
branches/amatthies/current/vice/src/arch/unix/gui/uipalemu.c
branches/amatthies/current/vice/src/arch/unix/joy.c
branches/amatthies/current/vice/src/arch/unix/macosx/Makefile.am
branches/amatthies/current/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
branches/amatthies/current/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
branches/amatthies/current/vice/src/arch/unix/macosx/cocoa/video.m
branches/amatthies/current/vice/src/arch/unix/sco_sol/make-bindist.sh
branches/amatthies/current/vice/src/arch/unix/skyos/make-bindist.sh
branches/amatthies/current/vice/src/arch/unix/tfearch.c
branches/amatthies/current/vice/src/arch/unix/x11/gnome/uipalcontrol.c
branches/amatthies/current/vice/src/arch/unix/x11/gnome/x11ui.c
branches/amatthies/current/vice/src/arch/win32/Makefile.am
branches/amatthies/current/vice/src/arch/win32/base.dsp
branches/amatthies/current/vice/src/arch/win32/c128ui.c
branches/amatthies/current/vice/src/arch/win32/kbd.c
branches/amatthies/current/vice/src/arch/win32/res.rc
branches/amatthies/current/vice/src/arch/win32/resc128.rc
branches/amatthies/current/vice/src/arch/win32/resc64.rc
branches/amatthies/current/vice/src/arch/win32/rescbm2.rc
branches/amatthies/current/vice/src/arch/win32/respet.rc
branches/amatthies/current/vice/src/arch/win32/resplus4.rc
branches/amatthies/current/vice/src/arch/win32/resvic20.rc
branches/amatthies/current/vice/src/arch/win32/ui.c
branches/amatthies/current/vice/src/arch/win32/uikeyboard.c
branches/amatthies/current/vice/src/arch/win32/vice.dsw
branches/amatthies/current/vice/src/arch/win32/watcom/base.tgt
branches/amatthies/current/vice/src/arch/win32/watcom/vice.wpj
branches/amatthies/current/vice/src/autostart.c
branches/amatthies/current/vice/src/autostart.h
branches/amatthies/current/vice/src/c128/c128-cmdline-options.c
branches/amatthies/current/vice/src/c128/c128mem.c
branches/amatthies/current/vice/src/c64/c64keyboard.c
branches/amatthies/current/vice/src/c64/c64mem.c
branches/amatthies/current/vice/src/c64/cart/stardos.c
branches/amatthies/current/vice/src/c64/digimax.c
branches/amatthies/current/vice/src/c64/ramcart.c
branches/amatthies/current/vice/src/c64/reu.c
branches/amatthies/current/vice/src/c64/tfe.c
branches/amatthies/current/vice/src/cbm2/cbm2mem.c
branches/amatthies/current/vice/src/gfxoutputdrv/bmpdrv.c
branches/amatthies/current/vice/src/init.c
branches/amatthies/current/vice/src/lib.c
branches/amatthies/current/vice/src/lib.h
branches/amatthies/current/vice/src/mem.h
branches/amatthies/current/vice/src/monitor/monitor.c
branches/amatthies/current/vice/src/pet/petmem.c
branches/amatthies/current/vice/src/pet/petsound.c
branches/amatthies/current/vice/src/plus4/plus4mem.c
branches/amatthies/current/vice/src/plus4/ted-sound.c
branches/amatthies/current/vice/src/screenshot.c
branches/amatthies/current/vice/src/sound.h
branches/amatthies/current/vice/src/translate.c
branches/amatthies/current/vice/src/translate.txt
branches/amatthies/current/vice/src/version.h
branches/amatthies/current/vice/src/vic20/vic20mem.c
branches/amatthies/current/vice/src/vic20/vic20sound.c
branches/amatthies/current/vice/src/vicii/vicii-badline.c
branches/amatthies/current/vice/src/vicii/vicii-draw.c
branches/amatthies/current/vice/src/vicii/vicii-fetch.c
branches/amatthies/current/vice/src/vicii/vicii-fetch.h
branches/amatthies/current/vice/src/vicii/vicii-mem.c
branches/amatthies/current/vice/src/vicii/vicii-sprites.c
branches/amatthies/current/vice/vice-mint.spec
branches/amatthies/current/vice/vice.spec
Added Paths:
-----------
branches/amatthies/current/svn-instructions.txt
branches/amatthies/current/vice/doc/GP2X-Howto.txt
branches/amatthies/current/vice/src/arch/win32/_vice.dsp
branches/amatthies/current/vice/src/clipboard.c
branches/amatthies/current/vice/src/clipboard.h
Removed Paths:
-------------
branches/amatthies/current/vice/src/arch/win32/_all.dsp
branches/amatthies/current/vice/src/arch/win32/vice.dsp
Property Changed:
----------------
branches/amatthies/current/vice/data/fonts/vice-cbm.bdf
branches/amatthies/current/vice/doc/html/hpux.html
branches/amatthies/current/vice/doc/html/qnx.html
branches/amatthies/current/vice/doc/html/sco.html
branches/amatthies/current/vice/src/c64/cart/actionreplay4.c
branches/amatthies/current/vice/src/c64/cart/actionreplay4.h
branches/amatthies/current/vice/src/c64/cart/stardos.c
branches/amatthies/current/vice/src/c64/cart/stardos.h
branches/amatthies/current/vice/vice-mint.spec
Copied: branches/amatthies/current/svn-instructions.txt (from rev 19094, tags/v2.0/v2.0/svn-instructions.txt)
===================================================================
--- branches/amatthies/current/svn-instructions.txt (rev 0)
+++ branches/amatthies/current/svn-instructions.txt 2008-08-01 21:32:15 UTC (rev 19095)
@@ -0,0 +1,373 @@
+
+Note that I am describing how to handle everything with a command-line
+SVN client. For GUI clients, it should be possible in a similar way.
+
+Additionally note that this is not a full introducion in Subversion, and
+it is not intended to be. Please, read the SVN book
+(http://svnbook.red-bean.com/) to get used to SVN.
+
+
+1. Reading the SVN repository
+=============================
+
+1.1 Naming scheme of releases:
+------------------------------
+
+The base name of the URL to retrieve working copies (cf. 1.2 below) is
+ https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/
+
+This will be called $BASE in the sequel.
+
+The naming for the releases is rather easy, but a little bit different
+from what you might be used to with SVN: First the trunk - that is,
+always the latest version - is named trunk. It can be found at
+
+ $BASE/trunk/
+
+All releases (developer releases as well a real releases) are put into
+'directories' at $BASE/tags/... . The main release name is next, and the
+developer releases is last. Here are some examples:
+
+ v1.13: $BASE/tags/v1.13/v1.13/
+ v1.13.5: $BASE/tags/v1.13/v1.13.5/
+ v1.22: $BASE/tags/v1.22/v1.22/
+ v1.22.9: $BASE/tags/v1.22/v1.22.9/
+
+Note that with the v0.xx releases, the main version had three numbers in
+it, thus:
+
+ v0.14.0: $BASE/tags/v0.14.0/v0.14.0/
+ v0.14.1: $BASE/tags/v0.14.1/v0.14.1/
+ v0.14.1.5: $BASE/tags/v0.14.1/v0.14.1.5/
+
+
+There are exceptions to this rule, though. These are:
+
+ v1.0.0.1: $BASE/tags/v1.0/v1.0.0.1/
+ v1.0.0.2: $BASE/tags/v1.0/v1.0.0.2/
+
+ (these two versions are the only ones of v1.xxx where the numbering
+ scheme of v0.xxx was still used)
+
+Additionally, there are the following releases:
+ v1.9a: $BASE/tags/v1.9/v1.9a/
+ v1.11-old: $BASE/tags/v1.11/v1.11-old/
+ v1.13a: $BASE/tags/v1.13/v1.13a/
+
+These are because releases v1.9 and v1.13 were replaced with their "a"
+counterparts shortly after release. v1.11-old was never released, but it
+was planned to release that one.
+
+Additionally note that there have been v0.14.2.74 and v0.14.2.75;
+unfortunately, I do not have these, only a patch from v0.14.2.74 ->
+v0.14.2.75, which is not sufficient to recreate these old ones, as the
+patches v0.14.2.73 -> v0.14.2.74 as well as the patch v0.14.2.75 ->
+v0.15.0 are missing, too.
+
+
+The directory "devel" is used for development work. In branches/,
+every user should create his own working directory with his name (spiro,
+andreasm, tibor, ...). In this directory, additional directories are
+created that resemble actual work.
+
+In tags/, every user should have his own working directory, too
+(names spiro, andreasm, tibor, ...). In this directories, tags are
+applied that resemble some milestones in development. For example, these
+tags are the basis for integration in the next developer release.
+
+
+
+Whenever you are in doubt about the directory structure, it might be a
+good idea to have a look into the online browseable directory on
+SourceForge:
+
+ http://vice-emu.svn.sourceforge.net/viewvc/vice-emu/tags/
+
+or the complete repository:
+
+ http://vice-emu.svn.sourceforge.net/viewvc/vice-emu/
+
+You can also use the "svn ls" command to see the contents of a
+directory. For example,
+
+$ svn ls https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/
+
+will print out everything that is in the tags/ subdirectory.
+
+
+
+1.2. Initial checkout
+---------------------
+
+If you want to start working on VICE, you first have to check out a
+working version of VICE. For example, to get the latest version of VICE,
+just enter:
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/ vice
+
+This will check out the "trunk" version of VICE - that is, always the
+latest - into a new directory called vice (last parameter). If you want
+to get a different version (for example, v1.22.3), just change the URL
+part of the command to:
+
+https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.3
+
+That is, the full command is:
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.3 vice
+
+to put everything into a new directory named "vice".
+
+
+
+1.3. Changing your workspace to another release
+-----------------------------------------------
+
+Sometimes, it might be convenient to be able to change your working copy
+to the one from another release. For example, you are hunting for the
+release where a certain bug was introduced. Of course, you can always
+check out specific releases (cf. 1.2). Unfortunately, this will always
+pull ALL files from the server, which takes time and network bandwidth.
+
+Instead, you might want to change a specific directory to another one.
+This can be done with the "svn switch" statement. Take, for example, you
+want to change to v1.20.5. You can do this with:
+
+~/vice$ svn switch https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.20/v1.20.5
+
+Note that you must be IN the directory where you previously checked out
+VICE!
+
+You can switch multiple times, as you want to. Note that any changed
+file will get the timestamp of the time this file was written while
+switching. This is to ensure (as good as possible) that the Makefile
+will recognize the changes, so you will be able to compile from that
+working set as soon as possible.
+
+You can switch back to the trunk using:
+
+~/vice$ svn switch https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/
+
+
+Note: If you have made local changes, svn switch will try to merge your
+changes into your working set.
+
+
+1.4. Reverting your workspace to what is on the server
+------------------------------------------------------
+
+Take that you have made changed to your workspace and compiled files.
+Now, you want to delete all files that are not under version control.
+The following file outputs these extra files to be deleted:
+
+~/vice$ svn status --no-ignore|sed -n -e "s/^[I|\?]//p"|xargs -n 1 echo rm -rf --
+
+If you run this command, it will output every file not under control,
+prepended by "rm -rf --". If you are really sure these files are all ok,
+you can delete them by removing the "echo" there.
+
+NOTE: THIS COMMAND DOES NOT HANDLE ALL CASES CORRECTLY! For example,
+files with SPACES will not be handled correctly. I would never recommend
+to use this command without actually having a look at what is to be
+deleted beforehand. USE AT YOUR OWN RISK!
+
+
+Another thing often encountered is that you have made some changes which
+you do not like anymore. For this, you can undo the changes made with
+the command:
+
+~/vice$ svn revert <PATHTOFILE>
+
+This will undo the local change completely, and you will have a copy of
+what is on the server.
+
+If you want to revert anything done, use
+
+~/vice$ svn revert --recursive .
+
+to revert everything in the current directory and its sub-directories.
+
+
+1.5 Get the newest version from the server
+------------------------------------------
+
+If someone has done any changes on the repository, you might want to get
+the latest changes. For this, you can use the "svn update" command which
+will retrieve the latest versions of all the files from the server.
+
+If you want to know beforehand what has changed, the "svn status"
+command is helpful.
+
+For both commands, have a look at the SVN book, or to the online help
+(svn --help update, for example, or info sed on Unixoid machines).
+
+
+
+2. Making your changes
+======================
+
+If you want to start development, you have to perform the following
+steps:
+
+a. Create your own workspace in a branch
+b. Change to this branch
+c. Make you local changes
+d. Commit your local changes
+e. repeat steps c. and d. as often as you like
+
+
+2.1. Creating your own workspace
+--------------------------------
+
+Whenever you want to make a change to VICE, you should perform these
+steps in your own branch. For this, generate a copy of the latest
+version. For this, generate a branch to work on:
+
+~/$ svn copy https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.10 https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro/v1.22.10-MYFEATURE
+
+This is too long for you? If you are in a working copy, you can also
+abbreviate this:
+
+~/vice$ svn copy tags/v1.22/v1.22.10 branches/spiro/v1.22.10-MYFEATURE
+
+Of course, replace my name "spiro" with you own, and replace the version
+(v1.22, v1.22.10) with the latest version, and replace MYFEATURE with
+something that makes more sense - that is, with what you are doing.
+
+The above naming would be equivalent to what was named
+spiro-1.22.10-MYFEATURE.diff with our old naming scheme.
+
+
+Make sure you have generated your own working directory before
+performing the above step, however. That is, for the first time you want
+to create a branch, you have to perform:
+
+
+~/vice$ svn mkdir branches/spiro
+
+or
+
+~/$ svn mkdir https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro
+
+Note that you must give a revision message; that is, a message where you
+are describing what you have done. You can do this either after pressing
+enter, or append it directly to the command:
+
+~/vice$ svn mkdir branches/spiro -m "Generated Spiro's working branch"
+
+
+NOTE: While one may be tempted to use the trunk to branch from, I would
+not recommend it here. The reason is simple: The maintainer might
+already be doing some integration work on the trunk, in which case you
+would branch from an intermediate version, which might not be a good
+idea. Additionally, it is harder (but not impossible) to find out from
+which version you just branched off if you do it from the branch. So, it
+is better to use the tags to branch from!
+
+
+2.2 Changing to your working branch
+-----------------------------------
+
+Now, either checkout a new working copy (cf. 1.2) or revert your current
+one (cf. 1.3.):
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro/v1.22.10-MYFEATURE/
+
+or
+
+~/vice$ svn switch branches/spiro/v1.22.10-MYFEATURE/
+
+
+2.3 Make your local changes
+---------------------------
+
+Yes - now, you are allowed to do whatevery you like in your working
+copy. Change the VICE code any way you like it.
+
+There are some commands which might be helpful, however:
+
+- svn status - let's you find out which files you have changed locally
+- svn diff - you can do a diff against the version of the server,
+ so you can find out what you have changed in the
+ meantime in detail.
+
+
+2.4 Commit you local changes
+----------------------------
+
+This is the important step. As long as you do not commit, no one will be
+able to see what you have changed.
+
+It is best to start with a
+
+~/vice$ svn status
+
+which will show you which files you have changed.
+
+Files which are prepended with an "?" are the files which are not under
+version control yet. If you have added some files, these will be shown
+with the "?". Now, you must add them:
+
+~/vice$ svn add NEWFILE
+
+The same applies for the directories, by the way.
+
+Again, these changes will not show up until you commit:
+
+~/vice$ svn commit
+
+You will be asked for your log message, which you should enter here.
+
+
+2.5 Marking milestones
+----------------------
+
+Whenever you have a milestone reached, you can tag the current version.
+Additionally, if you want your latest changes to be included in the next
+official version of VICE, you MUST tag the current version. A tag is
+just a convenient way to remember the state you were working on.
+
+To create a tag, you must create a (virtual) copy of your current
+workspace. First, make sure you have committed any changes (by issuing a
+"cvs status" command). Then, tag your workspace by:
+
+~/vice$ svn copy branches/spiro/v1.22.10-MYFEATURE tags/spiro/v1.22.10-MYFEATURE
+
+(you can use the full URL, too)
+
+You can append numbers to the "MYFEATURE" if you want to have multiple
+milestones.
+
+
+If you want the feature to be added for the next release, just write a
+mail on the mailing list, mentioning the full path to the tag.
+
+
+
+3. Some maintainance work documentation
+=======================================
+
+(to be continued, just some snippets so far)
+
+3.1 Creating a source distribution
+----------------------------------
+
+a. Add all patches to be included
+b. Change the version number of the distribution in configure.in,
+ VICE_VERSION_MAJOR, VICE_VERSION_MINOR, VICE_VERSION_BUILD. Also,
+ define/undefine UNSTABLE there if this is a release, or not.
+c. Add entries in ChangeLog, src/ChangeLog
+d. Execute: autoreconf; ./configure; make dist
+e. svn commit
+f. svn copy https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/ https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/vX.YY/vX.YY.ZZ
+g. copy vice-X.YY.ZZ to viceteam.org/devel/
+
+
+
+4. Misc
+=======
+
+Make sure that the code you change:
+- has proper line endings (svn properties set correctly)
+- only uses C style comments (/* ... */), not C++ style - at least for
+ platform independant ("common") code.
Modified: branches/amatthies/current/vice/ChangeLog
===================================================================
--- branches/amatthies/current/vice/ChangeLog 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/ChangeLog 2008-08-01 21:32:15 UTC (rev 19095)
@@ -1,3 +1,80 @@
+2008-07-18 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 2.0
+
+2008-07-18 Christian Vogelgsang <ch...@vo...>
+
+ * build/macosx/build-vice-release.sh: use provided autogen.sh
+
+ * doc/ReadmeMacOSX.txt: updated mac docs
+
+ * doc/html/macosx.html: Prepared for release of 2.0
+
+2008-07-17 Spiro Trikaliotis <spi...@gm...>
+
+ * doc/vice.texi, doc/html/plain/NEWS, doc/html/index.html,
+ doc/Win32-Cygwin-HOWTO.txt: Prepared for upcoming 2.0 release.
+
+2008-07-16 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.27
+
+2008-07-15 Marco van den Heuvel <bla...@ya...>
+
+ * Makefile.am: Reverted the skyos make bindist(zip) part back to
+ what is used to be.
+
+2008-07-14 Marco van den Heuvel <bla...@ya...>
+
+ * README: Updated for the 2.0 release.
+
+2008-07-13 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.26
+
+2008-07-12 Marco van den Heuvel <bla...@ya...>
+
+ * build/riscos/build-cross.sh: Added a missing 'cd ..'.
+
+ * configure.in: Corrected a typo.
+
+ * doc/Readme.beos: Updated.
+
+ * vice-mint.spec, vice.spec: Release version updated to 2.0.
+
+2008-07-10 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.25
+
+2008-07-07 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.24
+
+2008-07-07 Marco van den Heuvel <bla...@ya...>
+
+ * doc/html/plain/NEWS: Updated.
+
+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/amatthies/current/vice/Makefile.am
===================================================================
--- branches/amatthies/current/vice/Makefile.am 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/Makefile.am 2008-08-01 21:32:15 UTC (rev 19095)
@@ -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:
@@ -68,10 +75,10 @@
if UNIX_SKYOS_COMPILE
bindist:
- $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir) $(MAKE)
+ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir)
bindistzip:
- $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir) $(MAKE)
+ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir)
endif
if UNIX_QNX6_COMPILE
Modified: branches/amatthies/current/vice/README
===================================================================
--- branches/amatthies/current/vice/README 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/README 2008-08-01 21:32:15 UTC (rev 19095)
@@ -1,5 +1,5 @@
- VICE 1.22 Aug 2007
+ VICE 2.0 Jul 2008
_______________
Modified: branches/amatthies/current/vice/build/macosx/build-vice-release.sh
===================================================================
--- branches/amatthies/current/vice/build/macosx/build-vice-release.sh 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/build/macosx/build-vice-release.sh 2008-08-01 21:32:15 UTC (rev 19095)
@@ -96,13 +96,8 @@
# configure snapshot
echo "configuring new source tree"
-(cd "$SRC_DIR/src/resid" && aclocal && automake && autoconf) >/dev/null 2>&1
+(cd "$SRC_DIR" && ./autogen.sh)
if [ $? != 0 ]; then
- echo "ERROR: configuring resid..."
- exit 1
-fi
-(cd "$SRC_DIR" && aclocal && autoheader && automake --add-missing && autoconf) >/dev/null 2>&1
-if [ $? != 0 ]; then
echo "ERROR: configuring VICE..."
exit 1
fi
Modified: branches/amatthies/current/vice/build/riscos/build-cross.sh
===================================================================
--- branches/amatthies/current/vice/build/riscos/build-cross.sh 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/build/riscos/build-cross.sh 2008-08-01 21:32:15 UTC (rev 19095)
@@ -127,4 +127,5 @@
ln -s arch/riscos/config.h config.h
make
+cd ..
make bindistzip
Modified: branches/amatthies/current/vice/configure.in
===================================================================
--- branches/amatthies/current/vice/configure.in 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/configure.in 2008-08-01 21:32:15 UTC (rev 19095)
@@ -7,15 +7,15 @@
AC_INIT(src/maincpu.c)
-VICE_VERSION_MAJOR=1
-VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=22
+VICE_VERSION_MAJOR=2
+VICE_VERSION_MINOR=0
+VICE_VERSION_BUILD=0
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
AC_SUBST(VICE_VERSION_BUILD)
-AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
+dnl AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR
@@ -125,7 +125,7 @@
if test x"$host_os" = "xminix"; then
AC_DEFINE(MINIX_SUPPORT,,[do we need minix support])
CFLAGS="$CFLAGS -D_MINIX -D_POSIX_SOURCE"
- MINIX_RELEASE=`uname -s`
+ MINIX_RELEASE=`uname -r`
MINIX_VERSION=`uname -v`
if test x"$MINIX_RELEASE" != "x3"; then
AC_MSG_ERROR([VICE works only on minix 3 and up])
Property changes on: branches/amatthies/current/vice/data/fonts/vice-cbm.bdf
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:eol-style
+ native
Copied: branches/amatthies/current/vice/doc/GP2X-Howto.txt (from rev 19094, tags/v2.0/v2.0/vice/doc/GP2X-Howto.txt)
===================================================================
--- branches/amatthies/current/vice/doc/GP2X-Howto.txt (rev 0)
+++ branches/amatthies/current/vice/doc/GP2X-Howto.txt 2008-08-01 21:32:15 UTC (rev 19095)
@@ -0,0 +1,27 @@
+This document describes how to compile the GP2X port.
+
+
+First of all you will need to install DevkitGP2X, and make sure the
+cross-toolchain binaries are in the PATH.
+
+After installing DevkitGP2X you will need to copy or make links for the
+following files:
+
+arm-linux-ar to arm-gp2x-linux-ar
+arm-linux-g++ to arm-gp2x-linux=g++
+arm-linux-gcc to arm-gp2x-linux-gcc
+arm-linux-ranlib to arm-gp2x-linux-ranlib
+arm-linux-strip to arm-gp2x-linux-strip
+
+After doing this you will be able to use the --host configure option for
+VICE to have it build the GP2X port. In other words, you just use:
+
+./configure --host=arm-gp2x-linux
+
+And the configure script will try to find and use the correct
+cross-toolchain (arm-gp2x-linux-*), and set the correct CFLAGS and LDFLAGS
+for the GP2X port.
+
+After the compile is done you can use 'make bindist' to create a binary
+distribution directory, or use 'make bindistzip' to create a binary
+distribution zip archive.
Modified: branches/amatthies/current/vice/doc/Makefile.am
===================================================================
--- branches/amatthies/current/vice/doc/Makefile.am 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/Makefile.am 2008-08-01 21:32:15 UTC (rev 19095)
@@ -17,7 +17,8 @@
cartconv.txt \
iec-bus.txt \
mon.txt \
- openGLsync-howto.txt
+ openGLsync-howto.txt \
+ GP2X-Howto.txt
info_TEXINFOS = vice.texi
Modified: branches/amatthies/current/vice/doc/Readme.beos
===================================================================
--- branches/amatthies/current/vice/doc/Readme.beos 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/Readme.beos 2008-08-01 21:32:15 UTC (rev 19095)
@@ -3,11 +3,8 @@
REQUIREMENTS
---------------------------
-BeVICE was developed and so far tested under BeOS 5 Personal Edition
-on a quite fast machine (Pentium II 400MHz) with Soundblaster 64 PCI
-and two standard analog joysticks on a Y-cable.
-I'm highly interested in experiences with other hardware and BeOS
-releases (see FEEDBACK)
+BeVICE was developed and so far tested under BeOS 5 Personal Edition,
+Zeta and Haiku.
INSTALLATION
------------------------
@@ -47,7 +44,6 @@
specific setting are missing; use commandline options or
edit the vice.ini.
- Fullsrceen mode is needed.
-- No binaries for PPC so far.
FEEDBACK
------------------
@@ -56,4 +52,5 @@
mailto:vic...@fi...
or directly to BeOS porter
mailto:and...@gm...
-
+or BeOS maintainer
+ mailto:bla...@ya...
Modified: branches/amatthies/current/vice/doc/ReadmeMacOSX.txt
===================================================================
--- branches/amatthies/current/vice/doc/ReadmeMacOSX.txt 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/ReadmeMacOSX.txt 2008-08-01 21:32:15 UTC (rev 19095)
@@ -1,9 +1,9 @@
-MacOS X Port of VICE
+Mac OS X Port of VICE
====================
This document contains information relevant for the Mac OS X Port of VICE.
-This official MacOS X Port is maintained by
+This official Mac OS X Port is maintained by
Christian Vogelgsang <ch...@vo...>
@@ -11,35 +11,48 @@
--------
1. Installation
- 2. Usage
- 3. Building VICE
- 4. Feedback
+ 2. Usage of Gtk+/X11 Port
+ 3. Usage of Cocoa Port
+ 4. Joystick Support
+ 5. Building VICE
+ 6. Feedback
1. Installation
---------------
-1.1 Install X11
-Make sure to have X11.app installed on your Mac. It is provided on your Mac
+1.1 Choose Port
+
+The VICE Emulators for Macs are distributed in three versions that use
+different UI front ends: native Cocoa, X11/Xaw, and, Gtk+. The first one
+directly uses the well known Mac user interface. The other ones are based on
+the X11 Window System that is available additionally for Mac OS X.
+
+X11/Xaw is based on the original X11 interface of VICE and is very light but
+with limited UI interface. The second one is based on the Gtk+ widget library
+and has a feature rich UI with pull-down menus. Xaw is a slim port that needs
+no non-system extra libraries, Gtk+ requires a large set of external libs and
+thus is quite large.
+
+The ports are named with *-cocoa-*, *-x11-*, or *-gtk-* in the distribution
+archive name.
+
+The X11/Xaw and Gtk+ are complete ports, i.e. all features available on other
+systems are available and all emulators are included. The Cocoa port is still
+under construction and thus considered "experimental". It does not include all
+features available and some emulators are not complete.
+
+
+1.2 Install X11 (Only for X11/Xaw and Gtk+ Port)
+
+Make sure you have X11.app installed on your Mac. It is provided on your Mac
OSX install CD/DVD (at least on Mac OS X 10.4 or later) and often not
installed by default. Click on the corresponding "X11.pkg" to install it. On
newer systems there is an "Optional Installs.pkg" installer that allows to
install X11 in the "Custom Installation" section.
-1.2 Choose Version
-The VICE Emulators for Macs are distributed in two versions that use different
-UI front ends: X11 or Gtk+. The first one is based on the original X11
-interface of VICE and is very light. The second one is based on the Gtk+
-widget library and has a feature rich UI with pull-down menus.
-
-X11 is a slim port that needs no non-system extra libraries, Gtk+ requires a
-large set of external libs and thus is quite large.
-
-The two ports are named with *-x11-* or *-gtk-* in the distribution archive
-name.
-
1.3 Install Application
The Mac OS X port is distributed as a disk image *.dmg. Just click on the
@@ -47,8 +60,11 @@
disk image to your hard disk. Just create a new VICE directory in your
applications folder (/Applications) and copy all files there.
-1.4 Create Bundles for each Emulator
+If you like, you can move the Application binaries anywhere you want.
+
+1.4 Create Bundles for each Emulator (Optional; Only for X11/Xaw and Gtk+ Port)
+
The VICE distribution contains a single application bundle called VICE. If you
run this one by double clicking on it then it will ask which emulator to run.
@@ -61,6 +77,7 @@
The separate emulator application bundles are not distributed in the release
dmg to save download time and server space.
+
1.5 Setup Command Line Tools
You can use the emulators and some additional tools (e.g. c1541, cardconv,
@@ -73,8 +90,10 @@
The command line emulators are launched with a helper script that calls the
binary embedded in the VICE.app application bundle. It is important to keep
the VICE.app bundle in the directory directly next to the "tools" directory
-otherwise the command line emulators will not run.
+otherwise the command line emulators will not run. Similarly, the Cocoa port
+needs the emulator App bundle in the same directory.
+
1.6 Network Setup
This port of VICE supports the ethernet emulation available in some emulators
@@ -98,10 +117,15 @@
libpcap-source distribution. Download from http://www.tcpdump.org and have a
look at libpcap/README.macosx.
+Unfortunately, the WLAN adapter (usually device en1) on portable Macs does not
+support libpcap packet capturing (as of 10.4 and 10.5). So TFE emulation on a
+wireless network adapter may not work. Use the ethernet port instead.
-2. Usage
---------
+
+2. Usage of Gtk+ and X11/Xaw Ports
+----------------------------------
+
2.1 Run VICE Bundle
Simply run the emulator suite by clicking on the VICE.app icon. A chooser
@@ -109,15 +133,19 @@
to launch an emulator directly then see section 1.4 for creating separate
bundles for each emulator.
-The VICE Bundle supports a simple style of drag and drop: You can launch the
+On start up the bundle will first open a terminal window (xterm) for the VICE
+log messages and then the screen windows for the virtual displays.
+
+The VICE bundles support a simple style of drag and drop: You can launch the
emulator by dragging a disk image (*.d64 *.d71 *.d81) or a program file (*.prg
*.p00) on the bundle icon. This will smart-attach the given binary and launch
the emulator. If the emulator is already running then drag and drop does not
work.
-On start up the bundle will first open a terminal window (xterm) for the VICE
-log messages and then the screen windows for the virtual displays.
+Also, an emulator bundle will register the typical file types (see above) and
+then you can simply click on a disk image directly to launch it in VICE.
+
2.2 Run from Command Line
First add the "tools" directory to your PATH (see section 1.5) in your
@@ -125,10 +153,11 @@
script in "tools" (e.g. x64, x128...). Any arguments passed to the launcher
are directly forwarded to the emulator binary.
-On start up the launcher ensures that the X11 environment is available and
-redirects all console output directly to the console. An additional xterm
-window for log messages is not opened.
+For the Gtk+ and X11/Xaw ports on start up the launcher ensures that the X11
+environment is available and redirects all console output directly to the
+console. An additional xterm window for log messages is not opened.
+
2.3 Use the X11 UI
The X11 UI is very light and only presents the virtual display in a window
@@ -151,6 +180,7 @@
Have a look at the official VICE manuals for an in-depth description of the
available commands and options.
+
2.4 Use the Gtk+ UI
The Gtk+ UI is much more user-friendly. An emulator window with a pull-down
@@ -164,8 +194,9 @@
Have a look at the official VICE manuals for an in-depth description of the
available commands and options.
-2.5 Keyboard Mapping
+2.5 Keyboard Mapping in Gtk+/X11
+
The keyboard mapping on X11 (and on your Mac) is done as follows:
1. Map raw key code of your keyboard to X11 key code with Xmodmap
@@ -183,7 +214,7 @@
choosing a file or by selecting a predefined one. Predefined symbolic and
positional mappings are available.
-The symbolic mapping assigns the pressed Mac key to the same labeled key on
+The 'symbolic mapping' assigns the pressed Mac key to the same labeled key on
the virtual cbm keyboard. So pressing F1 on the Mac presses F1 on the emulated
machine. It also does automatic shifting/unshifting, e.g. pressing F2 on the
Mac results in a virtual shift press and a virtual key F1 press (i.e. F2 is
@@ -205,12 +236,12 @@
Left Arrow Underscore (_)
Up Arrow Tilde (~) Backtick (`) Grave (^)
-The positional mappings try to map the physical location of a key on the Mac
+The 'positional mappings' try to map the physical location of a key on the Mac
keyboard to a virtual key at a similar position. E.g. your top and leftmost
key will be the top and leftmost key on your virtual machine. Unfortunately,
this mapping does not work always as expected: It relies heavily on the
national layout of your keymap. Furthermore, the physical layout of Mac and
-VICE machine do not match exactly so positional mapping will always be an
+VICE machine do not match exactly, so positional mapping will always be an
approximation. This can be even more complicate if you use different key
mappings on your Mac.
@@ -220,8 +251,56 @@
keys to control software features". The hardware controls are then accessed by
pressing F1-F12 + Fn key.
-2.6 Joystick Support
+
+3. Usage of Cocoa Port
+----------------------
+
+Note: The Cocoa port is still "experimental", i.e. it is not full featured and
+some things may be missing. This holds for the documentation as well ;)
+
+3.1 Features
+
+ * native Mac OS X user interface with modeless dialogs
+ * any-size/fullscreen OpenGL accelerated rendering
+ * multi-threaded emulation core
+
+
+3.2 Current State
+
+ * x64 90% complete, runs with UI and most menus and dialogs.
+
+ * All other emus: binaries are available, no menus and dialogs.
+ Use CMD+Q to quit such an emulator and drag&drop to attach disk images.
+ Some keyboard mappings already work, others not.
+
+
+3.3 Known Issues
+
+ * The Resource Inspector lacks correct input cells. All values have to
+ be entered as strings.
+ * Some Menu entries are not greyed out but still do nothing.
+
+
+3.4 Key Mapping
+
+The key mapping show the Mac key on a US extended mapping and the right one is
+the emulated Commodore key. Special keys are marked with <Symbol>.
+
+ § (Paragraph) <LEFT ARROW>
+ <Tab> <CONTROL>
+ ` (Backtick), Left Alt/Ctrl <CBM>
+ <ESC> <RUN/STOP>
+ <Backspace> <DEL>
+ <F9>, <PgDown> <POUND>
+ <F10>, <PgUp> <UP ARROW>
+ <F11>, <Home> <CLR/HOME>
+ <F12> <RESTORE>
+
+
+4. Joystick Support
+-------------------
+
The Mac ports has support for USB joysticks. It requires a generic USB HID
joystick device which is supported by most joystick models. Every button of
the joystick is mapped to the single virtual fire button in the emulator. The
@@ -242,14 +321,15 @@
should work with other models as well.
-3. Building VICE
+5. Building VICE
----------------
This section is only relevant if you want to compile an own distribution of
VICE from the source code.
-3.1 XCode
+5.1 XCode
+
If you wan to compile VICE yourself then you first need to install Apple's
XCode Development kit. It is available on your Mac OS X Installation DVD or
can be downloaded for free (after registration) from the Apple Developer
@@ -260,10 +340,11 @@
XCode itself is not required but the command line tools (compiler, linker...)
and other development files (SDKs).
-3.2 Required Tools
-The following tools are required or optional for a successfull VICE build:
+5.2 Required Tools
+The following tools are required or optional for a successful VICE build:
+
- Platypus (Optional)
http://www.sveinbjorn.org/platypus
@@ -276,8 +357,9 @@
script does not support drag and drop and quits immediately afert start up
(i.e. the VICE application icon disappears after the launch)!
-3.3 Required Library Sources
+5.3 Required Library Sources
+
VICE for Macs relies on a number of external libraries. You have to get their
source code as they are missing on a default Mac system. Some libs are
optional, i.e. if they are available then some extra features of VICE are
@@ -317,8 +399,9 @@
lame-3.97.tar.gz http://lame.sourceforge.net/
svn tree at svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-svn
-3.4 Building Required Libraries
+5.4 Building Required Libraries
+
First, build all external libraries. The VICE source distribution contains
build scripts to automatically perform this step.
@@ -342,8 +425,9 @@
If all went well then the libraries are compiled and installed in the "extlib"
directory. The libraries are now ready for the VICE build.
-3.5 Building VICE
+5.5 Building VICE
+
The build process of VICE contains the following steps: Call "configure" in
the source tree to determine the required "make" system setup and find
available libs. Then compile the source tree to get binaries of all emulators
@@ -399,7 +483,7 @@
disk image found in the "TEMP/x11/ub/" directory.
-4. Feedback
+6. Feedback
-----------
If you discover problems not listed above or just want to tell us your
Modified: branches/amatthies/current/vice/doc/Win32-Cygwin-HOWTO.txt
===================================================================
--- branches/amatthies/current/vice/doc/Win32-Cygwin-HOWTO.txt 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/Win32-Cygwin-HOWTO.txt 2008-08-01 21:32:15 UTC (rev 19095)
@@ -13,7 +13,7 @@
dependencies.
2. Obtain a copy of the VICE sources. Extract the vice-x.xx directory into
- your Cygwin user's home directory (e.g. /home/Owner/vice-1.22).
+ your Cygwin user's home directory (e.g. /home/Owner/vice-2.0).
3. Obtain DirectX 7 header files and libraries. It doesn't look like
Microsoft still makes this distribution available for download from its
@@ -46,7 +46,7 @@
make bindist
to make an executable distribution, which will appear in a directory
- called e.g. /home/Owner/vice-1.22/src/WinVICE-1.22. For development
+ called e.g. /home/Owner/vice-2.0/src/WinVICE-2.0. For development
purposes, no further installation is necessary; you can run the
executables directly from this directory.
Modified: branches/amatthies/current/vice/doc/html/Makefile.am
===================================================================
--- branches/amatthies/current/vice/doc/html/Makefile.am 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/Makefile.am 2008-08-01 21:32:15 UTC (rev 19095)
@@ -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/amatthies/current/vice/doc/html/hpux.html
===================================================================
--- branches/amatthies/current/vice/doc/html/hpux.html 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/hpux.html 2008-08-01 21:32:15 UTC (rev 19095)
@@ -1,77 +1,77 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>The VICE Emulator</title>
-</head>
-
-<body text="#000000" bgcolor="#FFFFFF">
-
-<hr>
-
-<center>
-<img SRC="images/vice-logo.jpg" ALT="The VICE" align=CENTER>
-</center>
-
-<hr>
-<br>
-
-<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
-Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
-Mac OS X machine and executes programs intended for the old 8-bit
-computers. The current version emulates the C64, the C128, the VIC20,
-almost all PET models, the PLUS4 and the CBM-II (aka C610).
-
-<h2>
-Download VICE for HPUX based systems
-</h2>
-
-You can download the latest VICE distributions for HPUX systems here.
-Some distributions may not be available at the release date.
-
-<p>
-
-<li>
-<b>Source</b> distributions:
-</li>
-
-<ul>
-<li>
-Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
-</li>
-</ul>
-
-<p>
-
-<li>
-New <b>binary</b> distributions:
-</li>
-
-<ul>
-
-<li>
-Binary for <b>HPPA HPUX</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-hppa-11.11.depot.gz">vice-v2.0-hppa-11.11.depot.gz</a>.
-To be installed with the depot installer.
-</li>
-
-<li>
-Binary for <b>IA64 HPUX</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-ia64-11.31.depot.gz">vice-v2.0-ia64-11.31.depot.gz</a>.
-To be installed with the depot installer.
-</li>
-
-</ul>
-
-The files are taken from
-
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE">http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE</a>.
-
-<br><br>
-
-For more information visit the <a href="index.html">main page</a>.
-
-</body>
-
-</html>
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>The VICE Emulator</title>
+</head>
+
+<body text="#000000" bgcolor="#FFFFFF">
+
+<hr>
+
+<center>
+<img SRC="images/vice-logo.jpg" ALT="The VICE" align=CENTER>
+</center>
+
+<hr>
+<br>
+
+<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
+Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
+Mac OS X machine and executes programs intended for the old 8-bit
+computers. The current version emulates the C64, the C128, the VIC20,
+almost all PET models, the PLUS4 and the CBM-II (aka C610).
+
+<h2>
+Download VICE for HPUX based systems
+</h2>
+
+You can download the latest VICE distributions for HPUX systems here.
+Some distributions may not be available at the release date.
+
+<p>
+
+<li>
+<b>Source</b> distributions:
+</li>
+
+<ul>
+<li>
+Tarball:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
+</li>
+</ul>
+
+<p>
+
+<li>
+New <b>binary</b> distributions:
+</li>
+
+<ul>
+
+<li>
+Binary for <b>HPPA HPUX</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-hppa-11.11.depot.gz">vice-v2.0-hppa-11.11.depot.gz</a>.
+To be installed with the depot installer.
+</li>
+
+<li>
+Binary for <b>IA64 HPUX</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-ia64-11.31.depot.gz">vice-v2.0-ia64-11.31.depot.gz</a>.
+To be installed with the depot installer.
+</li>
+
+</ul>
+
+The files are taken from
+
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE">http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE</a>.
+
+<br><br>
+
+For more information visit the <a href="index.html">main page</a>.
+
+</body>
+
+</html>
Property changes on: branches/amatthies/current/vice/doc/html/hpux.html
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/html
Added: svn:eol-style
+ native
Modified: branches/amatthies/current/vice/doc/html/index.html
===================================================================
--- branches/amatthies/current/vice/doc/html/index.html 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/index.html 2008-08-01 21:32:15 UTC (rev 19095)
@@ -461,6 +461,11 @@
<a NAME="contact">Contacts
</h1>
+<p>VICE has moved its source repository to public services provided by
+<a href="http://sf.net/">SourceForge</a>. You can find it at <a
+href="http://sf.net/projects/vice-emu">http://sf.net/projects/vice-emu</a>.
+We like to thank the SourceForge staff for that help.</p>
+
<p>Before contacting us, have a look at the
<a href="http://vicekb.trikaliotis.net/">VICE knowledge base</a> if your
question is answered there. Keep in mind
@@ -473,8 +478,13 @@
<ul>
<li>
-Generic questions, bug reports, suggestions etc.: The Vice team
-(<a href="mailto:vic...@fi...">vic...@fi...</a>)
+Bug reports, suggestions, support requests should be directed to the
+SourceForge trackers at <a
+ href="http://sourceforge.net/tracker/?group_id=223021">http://sourceforge.net/tracker/?group_id=223021</a>.
+This way, you, the users, and we, the developers, can track what has
+been reported and what has been already fixed. Ideally, also sent the
+report to the mailing address of the Vice team at (<a
+ href="mailto:vic...@fi...">vic...@fi...</a>).
</li>
</ul>
Modified: branches/amatthies/current/vice/doc/html/macosx.html
===================================================================
--- branches/amatthies/current/vice/doc/html/macosx.html 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/macosx.html 2008-08-01 21:32:15 UTC (rev 19095)
@@ -43,7 +43,7 @@
On Intel Macs: Requires at least Mac OS X <b>10.4</b>
</li>
<li>
-<b>X11.app</b> Version 1.0 from Extra Installs on Mac OS X DVD
+<b>X11.app</b> Version 1.0 from Extra Installs on Mac OS X DVD for X11 and Gtk+ port.
</li>
</ul>
@@ -56,7 +56,7 @@
<ul>
<li>
Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-1.22.tar.gz">vice-1.22.tar.gz</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
</li>
</ul>
@@ -70,12 +70,12 @@
<li>
Universal Binary for <b>X11 Athena Widgets UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.22.dmg">vice-macosx-x11-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-2.0.dmg">vice-macosx-x11-ub-2.0.dmg</a>
</li>
<li>
Universal Binary for <b>X11 Gtk+ UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-2.0.dmg">vice-macosx-gtk-ub-2.0.dmg</a>
</li>
</ul>
@@ -87,7 +87,7 @@
<ul>
<li>
Universal Binary for <b>native Cocoa UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-1.22.dmg">vice-macosx-cocoa-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-2.0.dmg">vice-macosx-cocoa-ub-2.0.dmg</a>
<p><b>Note:</b> The Cocoa Port is not complete yet. The archive contains a runnable x64 with a subset of the upcoming features.
This binary is a technical preview of the new port and no full featured release of VICE. Please choose the X11/Athena or X11/Gtk+ port
for a complete Mac release.</p>
@@ -102,14 +102,20 @@
<li>
Universal Binary for <b>X11 Athena Widgets UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.21.dmg">vice-macosx-x11-ub-1.21.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.22.dmg">vice-macosx-x11-ub-1.22.dmg</a>
</li>
<li>
Universal Binary for <b>X11 Gtk+ UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.21.dmg">vice-macosx-gtk-ub-1.21.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
</li>
+<li>
+Universal Binary for <b>native Cocoa UI</b>:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
+
+</li>
+
</ul>
The files are taken from
Modified: branches/amatthies/current/vice/doc/html/plain/BUGS
===================================================================
--- branches/amatthies/current/vice/doc/html/plain/BUGS 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/plain/BUGS 2008-08-01 21:32:15 UTC (rev 19095)
@@ -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/amatthies/current/vice/doc/html/plain/NEWS
===================================================================
--- branches/amatthies/current/vice/doc/html/plain/NEWS 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/plain/NEWS 2008-08-01 21:32:15 UTC (rev 19095)
@@ -11,6 +11,12 @@
** General
----------
+- VICE development has moved to public services:
+ http://sf.net/projects/vice-emu
+ You can read the latest development in the Subversion
+ repository, file bug reports, and similar things.
+ Check it out!
+
- New Openserver 5.x, Openserver 6.x and Unixware ports.
- New AROS64 port.
@@ -41,6 +47,19 @@
- 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).
+
+- RESTORE key is handled differently now, fixing an NMI bug
+ because the NMI was asserted too long before.
+
** VIC20 changes
----------------
@@ -78,15 +97,32 @@
- Fixed mouse grab and xaw menu popup.
+- After a CPU jam user can select to resume emulation without
+ reset.
+
** MS-Windows changes
---------------------
- Fixed the reverse logic of the -confirmexit/+confirmexit and
-singlecpu/+singlecpu command-line options.
-- allow for pasting into the VICE window: Either via menu
- (Edit/Paste), or by right-clicking on the VICE window.
+- Added the ability to copy and paste text from and to the
+ VICE window.
+- Added the ability to paste text into the VICE window 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.
+
+- Key repeat is eliminated OS-wise. This way, the RESTORE key is
+ not used with autorepeat.
+
** BeOS changes
---------------
@@ -99,12 +135,27 @@
- Added warning dialog when the monitor is accessed without
having an open console window.
+- Added the ability to copy and paste text from and to the
+ VICE window.
+
** AmigaOS changes
------------------
- Fixed the reverse logic of the -confirmexit/+confirmexit
command-line options.
+- Added the ability to copy and paste text from and to the
+ VICE window.
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
+** OS/2 changes
+---------------
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
** Miscellaneous changes
------------------------
@@ -120,7 +171,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/amatthies/current/vice/doc/html/qnx.html
===================================================================
--- branches/amatthies/current/vice/doc/html/qnx.html 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/qnx.html 2008-08-01 21:32:15 UTC (rev 19095)
@@ -1,91 +1,91 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>The VICE Emulator</title>
-</head>
-
-<body text="#000000" bgcolor="#FFFFFF">
-
-<hr>
-
-<center>
-<img SRC="images/vice-logo.jpg" ALT="The VICE" align=CENTER>
-</center>
-
-<hr>
-<br>
-
-<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
-Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
-Mac OS X machine and executes programs intended for the old 8-bit
-computers. The current version emulates the C64, the C128, the VIC20,
-almost all PET models, the PLUS4 and the CBM-II (aka C610).
-
-<h2>
-Download VICE for QNX systems
-</h2>
-
-You can download the latest VICE distributions for QNX systems here.
-Some distributions may not be available at the release date.
-
-<p>
-
-<li>
-<b>Source</b> distributions:
-</li>
-
-<ul>
-<li>
-Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
-</li>
-</ul>
-
-<p>
-
-<li>
-New <b>binary</b> distributions:
-</li>
-
-<ul>
-
-<li>
-Binary for <b>x86 QNX 4.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-qnx4.tar.F">vice-2.0-qnx4.tar.F</a>.
-to be installed with the QNX 4.x installer.
-</li>
-
-<li>
-Binary for <b>x86 QNX 6.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/VICE-2.0-x86-public.qpr">VICE-2.0-x86-public.qpr</a>.
-To be installed with the QNX 6.x installer.
-</li>
-
-</ul>
-
-<li>
-Old <b>binary</b> distributions:
-</li>
-
-<ul>
-
-<li>
-Binary for <b>x86 QNX 6.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/VICE-1.22-x86-public.qpr">VICE-1.22-x86-public.qpr</a>.
-To be installed with the QNX 6.x installer.
-</li>
-
-</ul>
-
-The files are taken from
-
-<a href=...
[truncated message content] |
|
From: <ama...@us...> - 2008-08-01 20:07:13
|
Revision: 19094
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19094&view=rev
Author: amatthies
Date: 2008-08-01 20:07:22 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Cleanup.
Removed Paths:
-------------
branches/amatthies/v1.22.24-sprites/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-08-01 20:04:59
|
Revision: 19093
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19093&view=rev
Author: amatthies
Date: 2008-08-01 20:05:08 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Cleanup.
Removed Paths:
-------------
branches/amatthies/v1.22.14-mytestfeature/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-08-01 20:03:58
|
Revision: 19092
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19092&view=rev
Author: amatthies
Date: 2008-08-01 20:04:06 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Cleanup.
Removed Paths:
-------------
branches/amatthies/v1.22.16-sprites/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2008-08-01 11:55:06
|
Revision: 19091
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19091&view=rev
Author: nojoopa
Date: 2008-08-01 11:55:16 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Tagged x64dtv for merge
Added Paths:
-----------
tags/viceplus/v2.0-x64dtv/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2008-08-01 11:51:16
|
Revision: 19090
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19090&view=rev
Author: nojoopa
Date: 2008-08-01 11:51:25 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Created tags/viceplus
Added Paths:
-----------
tags/viceplus/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-31 16:44:07
|
Revision: 19089
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19089&view=rev
Author: blackystardust
Date: 2008-07-31 16:44:15 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
Added an x64dtv executable build prevention for the riscos and gp2x ports.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/configure.in
branches/viceplus/v2.0-x64dtv/vice/src/Makefile.am
Modified: branches/viceplus/v2.0-x64dtv/vice/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/Makefile.am 2008-07-31 11:21:37 UTC (rev 19088)
+++ branches/viceplus/v2.0-x64dtv/vice/Makefile.am 2008-07-31 16:44:15 UTC (rev 19089)
@@ -18,8 +18,10 @@
x128:
(cd src; $(MAKE) x128-all)
+if SUPPORT_X64DTV
x64dtv:
(cd src; $(MAKE) x64dtv-all)
+endif
xvic:
(cd src; $(MAKE) xvic-all)
Modified: branches/viceplus/v2.0-x64dtv/vice/configure.in
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/configure.in 2008-07-31 11:21:37 UTC (rev 19088)
+++ branches/viceplus/v2.0-x64dtv/vice/configure.in 2008-07-31 16:44:15 UTC (rev 19089)
@@ -1830,6 +1830,16 @@
AC_SUBST(XCBM2_WINRES)
+if test x"$is_unix_gp2x" = "xyes" ; then
+ AM_CONDITIONAL(SUPPORT_X64DTV, false)
+else
+ if test x"$is_riscos" = "xyes"; then
+ AM_CONDITIONAL(SUPPORT_X64DTV, false)
+ else
+ AM_CONDITIONAL(SUPPORT_X64DTV, true)
+ fi
+fi
+
dnl Setup the system-specific object files.
if test x"$is_unix" = "xyes"; then
ARCH_DIR="\$(top_builddir)/src/arch/unix"
Modified: branches/viceplus/v2.0-x64dtv/vice/src/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/Makefile.am 2008-07-31 11:21:37 UTC (rev 19088)
+++ branches/viceplus/v2.0-x64dtv/vice/src/Makefile.am 2008-07-31 16:44:15 UTC (rev 19089)
@@ -351,7 +351,11 @@
realdevice_lib =
endif
+if SUPPORT_X64DTV
bin_PROGRAMS = x64 x128 x64dtv xvic xpet xplus4 xcbm2 c1541 petcat cartconv
+else
+bin_PROGRAMS = x64 x128 xvic xpet xplus4 xcbm2 c1541 petcat cartconv
+endif
EXTRA_PROGRAMS =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2008-07-31 11:21:31
|
Revision: 19088
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19088&view=rev
Author: nojoopa
Date: 2008-07-31 11:21:37 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
svn property fixes for new files
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64dtv.icc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/viciidtv.icc
Property Changed:
----------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/c64dtvui.cc
branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/c64dtvui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64dtv.icc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/viciidtv.icc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64common.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64dtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64dtvc64.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/viciicommon.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/viciidtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-specific.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/uic64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/uic64dtv.h
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h 2008-07-31 00:07:16 UTC (rev 19087)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h 2008-07-31 11:21:37 UTC (rev 19088)
@@ -1,194 +1,194 @@
-/*
- * c64dtvuires.h
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#ifndef _C64UIRES_H_
-#define _C64UIRES_H_
-
-#include "uires.h"
-#include "intl.h"
-
-static struct TranslateNewMenu UI_MENU_NAME[] = {
- TITLE(IDMS_FILE, NULL)
-#ifndef AMIGA_AROS
- ITEM(IDMS_AUTOSTART_IMAGE, NULL, IDM_AUTOSTART)
- ITEMSEPARATOR()
-#endif
- ITEM(IDMS_ATTACH_DISK_IMAGE, NULL, NULL)
- SUB(IDMS_DRIVE_8, "8", IDM_ATTACH_8)
- SUB(IDMS_DRIVE_9, "9", IDM_ATTACH_9)
- SUB(IDMS_DRIVE_10, "0", IDM_ATTACH_10)
- SUB(IDMS_DRIVE_11, "1", IDM_ATTACH_11)
- ITEM(IDMS_DETACH_DISK_IMAGE, NULL, NULL)
- SUB(IDMS_DRIVE_8, NULL, IDM_DETACH_8)
- SUB(IDMS_DRIVE_9, NULL, IDM_DETACH_9)
- SUB(IDMS_DRIVE_10, NULL, IDM_DETACH_10)
- SUB(IDMS_DRIVE_11, NULL, IDM_DETACH_11)
- SUBSEPARATOR()
- SUB(IDMS_ALL, "A", IDM_DETACH_ALL)
- ITEM(IDMS_FLIP_LIST, NULL, NULL)
- SUB(IDMS_ADD_CURRENT_IMAGE, "I", IDM_FLIP_ADD)
- SUB(IDMS_REMOVE_CURRENT_IMAGE, "K", IDM_FLIP_REMOVE)
- SUB(IDMS_ATTACH_NEXT_IMAGE, "N", IDM_FLIP_NEXT)
- SUB(IDMS_ATTACH_PREVIOUS_IMAGE, "B", IDM_FLIP_PREVIOUS)
- SUBSEPARATOR()
- SUB(IDMS_LOAD_FLIP_LIST, NULL, IDM_FLIP_LOAD)
- SUB(IDMS_SAVE_FLIP_LIST, NULL, IDM_FLIP_SAVE)
- ITEMSEPARATOR()
- ITEMTOGGLE(IDMS_PAUSE, NULL, IDM_PAUSE)
- ITEM(IDMS_MONITOR, "M", IDM_MONITOR)
- ITEM(IDMS_RESET, NULL, NULL)
- SUB(IDMS_HARD, NULL, IDM_RESET_HARD)
- SUB(IDMS_SOFT, "R", IDM_RESET_SOFT)
- SUBSEPARATOR()
- SUB(IDMS_DRIVE_8, NULL, IDM_RESET_DRIVE8)
- SUB(IDMS_DRIVE_9, NULL, IDM_RESET_DRIVE9)
- SUB(IDMS_DRIVE_10, NULL, IDM_RESET_DRIVE10)
- SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
- ITEMSEPARATOR()
- ITEM(IDMS_EXIT, "X", IDM_EXIT)
- TITLE(IDMS_EDIT, NULL)
- ITEM(IDMS_COPY, NULL, IDM_COPY)
- ITEM(IDMS_PASTE, NULL, IDM_PASTE)
- TITLE(IDMS_SNAPSHOT, NULL)
- ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
- ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
- ITEMSEPARATOR()
- ITEM(IDMS_START_STOP_RECORDING, NULL, IDM_EVENT_TOGGLE_RECORD)
- ITEM(IDMS_START_STOP_PLAYBACK, NULL, IDM_EVENT_TOGGLE_PLAYBACK)
- ITEM(IDMS_SET_MILESTONE, "G", IDM_EVENT_SETMILESTONE)
- ITEM(IDMS_RETURN_TO_MILESTONE, "H", IDM_EVENT_RESETMILESTONE)
- ITEM(IDMS_RECORDING_START_MODE, NULL, NULL)
- SUBTOGGLE(IDMS_SAVE_NEW_SNAPSHOT, NULL, IDM_EVENT_START_MODE_SAVE)
- SUBTOGGLE(IDMS_LOAD_EXISTING_SNAPSHOT, NULL, IDM_EVENT_START_MODE_LOAD)
- SUBTOGGLE(IDMS_START_WITH_RESET, NULL, IDM_EVENT_START_MODE_RESET)
- SUBTOGGLE(IDMS_OVERWRITE_PLAYBACK, NULL, IDM_EVENT_START_MODE_PLAYBACK)
- ITEM(IDMS_SELECT_HISTORY_DIR, NULL, IDM_EVENT_DIRECTORY)
- ITEMSEPARATOR()
- ITEM(IDMS_SAVE_STOP_MEDIA_FILE, "C", IDM_MEDIAFILE)
- ITEMSEPARATOR()
- ITEM(IDMS_START_SOUND_RECORD, NULL, IDM_SOUND_RECORD_START)
- ITEM(IDMS_STOP_SOUND_RECORD, NULL, IDM_SOUND_RECORD_STOP)
- ITEMSEPARATOR()
- ITEM(IDMS_NETPLAY, NULL, IDM_NETWORK_SETTINGS)
- TITLE(IDMS_OPTIONS, NULL)
- ITEM(IDMS_REFRESH_RATE, NULL, NULL)
- SUBTOGGLE(IDMS_AUTO, NULL, IDM_REFRESH_RATE_AUTO)
- SUBTOGGLE(IDMS_1_1, NULL, IDM_REFRESH_RATE_1)
- SUBTOGGLE(IDMS_1_2, NULL, IDM_REFRESH_RATE_2)
- SUBTOGGLE(IDMS_1_3, NULL, IDM_REFRESH_RATE_3)
- SUBTOGGLE(IDMS_1_4, NULL, IDM_REFRESH_RATE_4)
- SUBTOGGLE(IDMS_1_5, NULL, IDM_REFRESH_RATE_5)
- SUBTOGGLE(IDMS_1_6, NULL, IDM_REFRESH_RATE_6)
- SUBTOGGLE(IDMS_1_7, NULL, IDM_REFRESH_RATE_7)
- SUBTOGGLE(IDMS_1_8, NULL, IDM_REFRESH_RATE_8)
- SUBTOGGLE(IDMS_1_9, NULL, IDM_REFRESH_RATE_9)
- SUBTOGGLE(IDMS_1_10, NULL, IDM_REFRESH_RATE_10)
- ITEM(IDMS_MAXIMUM_SPEED, NULL, NULL)
- SUBTOGGLE(IDMS_200_PERCENT, NULL, IDM_MAXIMUM_SPEED_200)
- SUBTOGGLE(IDMS_100_PERCENT, NULL, IDM_MAXIMUM_SPEED_100)
- SUBTOGGLE(IDMS_50_PERCENT, NULL, IDM_MAXIMUM_SPEED_50)
- SUBTOGGLE(IDMS_20_PERCENT, NULL, IDM_MAXIMUM_SPEED_20)
- SUBTOGGLE(IDMS_10_PERCENT, NULL, IDM_MAXIMUM_SPEED_10)
- SUBTOGGLE(IDMS_NO_LIMIT, NULL, IDM_MAXIMUM_SPEED_NO_LIMIT)
- SUBSEPARATOR()
- SUBTOGGLE(IDMS_CUSTOM, NULL, IDM_MAXIMUM_SPEED_CUSTOM)
- ITEMTOGGLE(IDMS_WARP_MODE, "W", IDM_TOGGLE_WARP_MODE)
- ITEMSEPARATOR()
- ITEMTOGGLE(IDMS_FULLSCREEN, "D", IDM_TOGGLE_FULLSCREEN)
- ITEMTOGGLE(IDMS_FULLSCREEN_STATUSBAR, NULL, IDM_TOGGLE_STATUSBAR)
- ITEMSEPARATOR()
- ITEMTOGGLE(IDMS_VIDEO_CACHE, NULL, IDM_TOGGLE_VIDEOCACHE)
- ITEMTOGGLE(IDMS_DOUBLE_SIZE, NULL, IDM_TOGGLE_DOUBLESIZE)
- ITEMTOGGLE(IDMS_DOUBLE_SCAN, NULL, IDM_TOGGLE_DOUBLESCAN)
- ITEMTOGGLE(IDS_PAL_EMULATION, NULL, IDM_TOGGLE_FASTPAL)
- ITEMTOGGLE(IDMS_SCALE2X, NULL, IDM_TOGGLE_SCALE2X)
-#if defined(HAVE_PROTO_CYBERGRAPHICS_H) && defined(HAVE_XVIDEO)
- ITEMTOGGLE(IDMS_VIDEO_OVERLAY, NULL, IDM_TOGGLE_OVERLAY)
-#endif
- ITEMSEPARATOR()
- ITEM(IDMS_SWAP_JOYSTICKS, "J", IDM_SWAP_JOYSTICK)
- ITEMSEPARATOR()
- ITEMTOGGLE(IDMS_SOUND_PLAYBACK, NULL, IDM_TOGGLE_SOUND)
- ITEMSEPARATOR()
- ITEMTOGGLE(IDMS_TRUE_DRIVE_EMU, NULL, IDM_TOGGLE_DRIVE_TRUE_EMULATION)
- ITEMTOGGLE(IDMS_VIRTUAL_DEVICE_TRAPS, NULL, IDM_TOGGLE_VIRTUAL_DEVICES)
- ITEMSEPARATOR()
- ITEM(IDMS_VIDEO_STANDARD, NULL, NULL)
- SUBTOGGLE(IDMS_PAL_G, NULL, IDM_SYNC_FACTOR_PAL)
- SUBTOGGLE(IDMS_NTSC_M, NULL, IDM_SYNC_FACTOR_NTSC)
- ITEMSEPARATOR()
- ITEMTOGGLE(IDMS_EMU_ID, NULL, IDM_TOGGLE_EMUID)
- ITEMTOGGLE(IDMS_PS2_MOUSE, NULL, IDM_PS2_MOUSE)
- ITEMTOGGLE(IDMS_GRAB_MOUSE, "Q", IDM_MOUSE)
- TITLE(IDMS_SETTINGS, NULL)
- ITEM(IDMS_VIDEO_SETTINGS, NULL, IDM_VIDEO_SETTINGS)
- ITEM(IDMS_PERIPHERAL_SETTINGS, NULL,IDM_DEVICEMANAGER)
- ITEM(IDMS_DRIVE_SETTINGS, NULL, IDM_DRIVE_SETTINGS)
- ITEM(IDMS_VICII_SETTINGS, NULL, IDM_VICII_SETTINGS)
-#ifdef AMIGA_OS4
- ITEM(IDMS_JOYSTICK_SETTINGS, NULL, IDM_JOY_SETTINGS)
-#else
- ITEM(IDMS_JOYSTICK_SETTINGS, NULL, NULL)
- SUB(IDMS_JOYSTICK_DEVICE_SELECT, NULL, IDM_JOY_DEVICE_SELECTION)
- SUB(IDMS_JOYSTICK_FIRE_SELECT, NULL, IDM_JOY_FIRE_SELECTION)
-#endif
- ITEM(IDMS_KEYBOARD_SETTINGS, NULL, IDM_KEYBOARD_SETTINGS)
- ITEM(IDMS_SOUND_SETTINGS, NULL, IDM_SOUND_SETTINGS)
- ITEM(IDMS_SID_SETTINGS, NULL, IDM_SID_SETTINGS)
- ITEM(IDMS_COMPUTER_ROM_SETTINGS, NULL, IDM_COMPUTER_ROM_SETTINGS)
- ITEM(IDMS_DRIVE_ROM_SETTINGS, NULL, IDM_DRIVE_ROM_SETTINGS)
- ITEM(IDMS_RAM_SETTINGS, NULL, IDM_RAM_SETTINGS)
- ITEM(IDMS_C64DTV_SETTINGS, NULL, IDM_C64DTV_SETTINGS)
- ITEMSEPARATOR()
- ITEM(IDMS_SAVE_CURRENT_SETTINGS, NULL, IDM_SETTINGS_SAVE)
- ITEM(IDMS_LOAD_SAVED_SETTINGS, NULL, IDM_SETTINGS_LOAD)
- ITEM(IDMS_SET_DEFAULT_SETTINGS, NULL, IDM_SETTINGS_DEFAULT)
- ITEMSEPARATOR()
- ITEMTOGGLE(IDMS_SAVE_SETTING_ON_EXIT, NULL, IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT)
- ITEMTOGGLE(IDMS_CONFIRM_ON_EXIT, NULL, IDM_TOGGLE_CONFIRM_ON_EXIT)
- TITLE(IDMS_LANGUAGE, NULL)
- ITEM(IDMS_LANGUAGE_ENGLISH, NULL, IDM_LANGUAGE_ENGLISH)
- ITEM(IDMS_LANGUAGE_GERMAN, NULL, IDM_LANGUAGE_GERMAN)
- ITEM(IDMS_LANGUAGE_FRENCH, NULL, IDM_LANGUAGE_FRENCH)
- ITEM(IDMS_LANGUAGE_HUNGARIAN, NULL, IDM_LANGUAGE_HUNGARIAN)
- ITEM(IDMS_LANGUAGE_ITALIAN, NULL, IDM_LANGUAGE_ITALIAN)
- ITEM(IDMS_LANGUAGE_DUTCH, NULL, IDM_LANGUAGE_DUTCH)
- ITEM(IDMS_LANGUAGE_POLISH, NULL, IDM_LANGUAGE_POLISH)
- ITEM(IDMS_LANGUAGE_SWEDISH, NULL, IDM_LANGUAGE_SWEDISH)
- TITLE(IDMS_HELP, NULL)
- ITEM(IDMS_ABOUT, NULL, IDM_ABOUT)
- ITEMSEPARATOR()
- ITEM(IDMS_COMMAND_LINE_OPTIONS, NULL, IDM_CMDLINE)
- ITEMSEPARATOR()
- ITEM(IDMS_CONTRIBUTORS, NULL, IDM_CONTRIBUTORS)
- ITEM(IDMS_LICENSE, NULL, IDM_LICENSE)
- ITEM(IDMS_NO_WARRANTY, NULL, IDM_WARRANTY)
- END()
-};
-
-static struct NewMenu UI_TRANSLATED_MENU_NAME[sizeof(UI_MENU_NAME)/sizeof(UI_MENU_NAME[0])];
-
-#endif /* _C64UIRES_H_ */
+/*
+ * c64dtvuires.h
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef _C64UIRES_H_
+#define _C64UIRES_H_
+
+#include "uires.h"
+#include "intl.h"
+
+static struct TranslateNewMenu UI_MENU_NAME[] = {
+ TITLE(IDMS_FILE, NULL)
+#ifndef AMIGA_AROS
+ ITEM(IDMS_AUTOSTART_IMAGE, NULL, IDM_AUTOSTART)
+ ITEMSEPARATOR()
+#endif
+ ITEM(IDMS_ATTACH_DISK_IMAGE, NULL, NULL)
+ SUB(IDMS_DRIVE_8, "8", IDM_ATTACH_8)
+ SUB(IDMS_DRIVE_9, "9", IDM_ATTACH_9)
+ SUB(IDMS_DRIVE_10, "0", IDM_ATTACH_10)
+ SUB(IDMS_DRIVE_11, "1", IDM_ATTACH_11)
+ ITEM(IDMS_DETACH_DISK_IMAGE, NULL, NULL)
+ SUB(IDMS_DRIVE_8, NULL, IDM_DETACH_8)
+ SUB(IDMS_DRIVE_9, NULL, IDM_DETACH_9)
+ SUB(IDMS_DRIVE_10, NULL, IDM_DETACH_10)
+ SUB(IDMS_DRIVE_11, NULL, IDM_DETACH_11)
+ SUBSEPARATOR()
+ SUB(IDMS_ALL, "A", IDM_DETACH_ALL)
+ ITEM(IDMS_FLIP_LIST, NULL, NULL)
+ SUB(IDMS_ADD_CURRENT_IMAGE, "I", IDM_FLIP_ADD)
+ SUB(IDMS_REMOVE_CURRENT_IMAGE, "K", IDM_FLIP_REMOVE)
+ SUB(IDMS_ATTACH_NEXT_IMAGE, "N", IDM_FLIP_NEXT)
+ SUB(IDMS_ATTACH_PREVIOUS_IMAGE, "B", IDM_FLIP_PREVIOUS)
+ SUBSEPARATOR()
+ SUB(IDMS_LOAD_FLIP_LIST, NULL, IDM_FLIP_LOAD)
+ SUB(IDMS_SAVE_FLIP_LIST, NULL, IDM_FLIP_SAVE)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_PAUSE, NULL, IDM_PAUSE)
+ ITEM(IDMS_MONITOR, "M", IDM_MONITOR)
+ ITEM(IDMS_RESET, NULL, NULL)
+ SUB(IDMS_HARD, NULL, IDM_RESET_HARD)
+ SUB(IDMS_SOFT, "R", IDM_RESET_SOFT)
+ SUBSEPARATOR()
+ SUB(IDMS_DRIVE_8, NULL, IDM_RESET_DRIVE8)
+ SUB(IDMS_DRIVE_9, NULL, IDM_RESET_DRIVE9)
+ SUB(IDMS_DRIVE_10, NULL, IDM_RESET_DRIVE10)
+ SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
+ ITEMSEPARATOR()
+ ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
+ TITLE(IDMS_SNAPSHOT, NULL)
+ ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
+ ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
+ ITEMSEPARATOR()
+ ITEM(IDMS_START_STOP_RECORDING, NULL, IDM_EVENT_TOGGLE_RECORD)
+ ITEM(IDMS_START_STOP_PLAYBACK, NULL, IDM_EVENT_TOGGLE_PLAYBACK)
+ ITEM(IDMS_SET_MILESTONE, "G", IDM_EVENT_SETMILESTONE)
+ ITEM(IDMS_RETURN_TO_MILESTONE, "H", IDM_EVENT_RESETMILESTONE)
+ ITEM(IDMS_RECORDING_START_MODE, NULL, NULL)
+ SUBTOGGLE(IDMS_SAVE_NEW_SNAPSHOT, NULL, IDM_EVENT_START_MODE_SAVE)
+ SUBTOGGLE(IDMS_LOAD_EXISTING_SNAPSHOT, NULL, IDM_EVENT_START_MODE_LOAD)
+ SUBTOGGLE(IDMS_START_WITH_RESET, NULL, IDM_EVENT_START_MODE_RESET)
+ SUBTOGGLE(IDMS_OVERWRITE_PLAYBACK, NULL, IDM_EVENT_START_MODE_PLAYBACK)
+ ITEM(IDMS_SELECT_HISTORY_DIR, NULL, IDM_EVENT_DIRECTORY)
+ ITEMSEPARATOR()
+ ITEM(IDMS_SAVE_STOP_MEDIA_FILE, "C", IDM_MEDIAFILE)
+ ITEMSEPARATOR()
+ ITEM(IDMS_START_SOUND_RECORD, NULL, IDM_SOUND_RECORD_START)
+ ITEM(IDMS_STOP_SOUND_RECORD, NULL, IDM_SOUND_RECORD_STOP)
+ ITEMSEPARATOR()
+ ITEM(IDMS_NETPLAY, NULL, IDM_NETWORK_SETTINGS)
+ TITLE(IDMS_OPTIONS, NULL)
+ ITEM(IDMS_REFRESH_RATE, NULL, NULL)
+ SUBTOGGLE(IDMS_AUTO, NULL, IDM_REFRESH_RATE_AUTO)
+ SUBTOGGLE(IDMS_1_1, NULL, IDM_REFRESH_RATE_1)
+ SUBTOGGLE(IDMS_1_2, NULL, IDM_REFRESH_RATE_2)
+ SUBTOGGLE(IDMS_1_3, NULL, IDM_REFRESH_RATE_3)
+ SUBTOGGLE(IDMS_1_4, NULL, IDM_REFRESH_RATE_4)
+ SUBTOGGLE(IDMS_1_5, NULL, IDM_REFRESH_RATE_5)
+ SUBTOGGLE(IDMS_1_6, NULL, IDM_REFRESH_RATE_6)
+ SUBTOGGLE(IDMS_1_7, NULL, IDM_REFRESH_RATE_7)
+ SUBTOGGLE(IDMS_1_8, NULL, IDM_REFRESH_RATE_8)
+ SUBTOGGLE(IDMS_1_9, NULL, IDM_REFRESH_RATE_9)
+ SUBTOGGLE(IDMS_1_10, NULL, IDM_REFRESH_RATE_10)
+ ITEM(IDMS_MAXIMUM_SPEED, NULL, NULL)
+ SUBTOGGLE(IDMS_200_PERCENT, NULL, IDM_MAXIMUM_SPEED_200)
+ SUBTOGGLE(IDMS_100_PERCENT, NULL, IDM_MAXIMUM_SPEED_100)
+ SUBTOGGLE(IDMS_50_PERCENT, NULL, IDM_MAXIMUM_SPEED_50)
+ SUBTOGGLE(IDMS_20_PERCENT, NULL, IDM_MAXIMUM_SPEED_20)
+ SUBTOGGLE(IDMS_10_PERCENT, NULL, IDM_MAXIMUM_SPEED_10)
+ SUBTOGGLE(IDMS_NO_LIMIT, NULL, IDM_MAXIMUM_SPEED_NO_LIMIT)
+ SUBSEPARATOR()
+ SUBTOGGLE(IDMS_CUSTOM, NULL, IDM_MAXIMUM_SPEED_CUSTOM)
+ ITEMTOGGLE(IDMS_WARP_MODE, "W", IDM_TOGGLE_WARP_MODE)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_FULLSCREEN, "D", IDM_TOGGLE_FULLSCREEN)
+ ITEMTOGGLE(IDMS_FULLSCREEN_STATUSBAR, NULL, IDM_TOGGLE_STATUSBAR)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_VIDEO_CACHE, NULL, IDM_TOGGLE_VIDEOCACHE)
+ ITEMTOGGLE(IDMS_DOUBLE_SIZE, NULL, IDM_TOGGLE_DOUBLESIZE)
+ ITEMTOGGLE(IDMS_DOUBLE_SCAN, NULL, IDM_TOGGLE_DOUBLESCAN)
+ ITEMTOGGLE(IDS_PAL_EMULATION, NULL, IDM_TOGGLE_FASTPAL)
+ ITEMTOGGLE(IDMS_SCALE2X, NULL, IDM_TOGGLE_SCALE2X)
+#if defined(HAVE_PROTO_CYBERGRAPHICS_H) && defined(HAVE_XVIDEO)
+ ITEMTOGGLE(IDMS_VIDEO_OVERLAY, NULL, IDM_TOGGLE_OVERLAY)
+#endif
+ ITEMSEPARATOR()
+ ITEM(IDMS_SWAP_JOYSTICKS, "J", IDM_SWAP_JOYSTICK)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_SOUND_PLAYBACK, NULL, IDM_TOGGLE_SOUND)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_TRUE_DRIVE_EMU, NULL, IDM_TOGGLE_DRIVE_TRUE_EMULATION)
+ ITEMTOGGLE(IDMS_VIRTUAL_DEVICE_TRAPS, NULL, IDM_TOGGLE_VIRTUAL_DEVICES)
+ ITEMSEPARATOR()
+ ITEM(IDMS_VIDEO_STANDARD, NULL, NULL)
+ SUBTOGGLE(IDMS_PAL_G, NULL, IDM_SYNC_FACTOR_PAL)
+ SUBTOGGLE(IDMS_NTSC_M, NULL, IDM_SYNC_FACTOR_NTSC)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_EMU_ID, NULL, IDM_TOGGLE_EMUID)
+ ITEMTOGGLE(IDMS_PS2_MOUSE, NULL, IDM_PS2_MOUSE)
+ ITEMTOGGLE(IDMS_GRAB_MOUSE, "Q", IDM_MOUSE)
+ TITLE(IDMS_SETTINGS, NULL)
+ ITEM(IDMS_VIDEO_SETTINGS, NULL, IDM_VIDEO_SETTINGS)
+ ITEM(IDMS_PERIPHERAL_SETTINGS, NULL,IDM_DEVICEMANAGER)
+ ITEM(IDMS_DRIVE_SETTINGS, NULL, IDM_DRIVE_SETTINGS)
+ ITEM(IDMS_VICII_SETTINGS, NULL, IDM_VICII_SETTINGS)
+#ifdef AMIGA_OS4
+ ITEM(IDMS_JOYSTICK_SETTINGS, NULL, IDM_JOY_SETTINGS)
+#else
+ ITEM(IDMS_JOYSTICK_SETTINGS, NULL, NULL)
+ SUB(IDMS_JOYSTICK_DEVICE_SELECT, NULL, IDM_JOY_DEVICE_SELECTION)
+ SUB(IDMS_JOYSTICK_FIRE_SELECT, NULL, IDM_JOY_FIRE_SELECTION)
+#endif
+ ITEM(IDMS_KEYBOARD_SETTINGS, NULL, IDM_KEYBOARD_SETTINGS)
+ ITEM(IDMS_SOUND_SETTINGS, NULL, IDM_SOUND_SETTINGS)
+ ITEM(IDMS_SID_SETTINGS, NULL, IDM_SID_SETTINGS)
+ ITEM(IDMS_COMPUTER_ROM_SETTINGS, NULL, IDM_COMPUTER_ROM_SETTINGS)
+ ITEM(IDMS_DRIVE_ROM_SETTINGS, NULL, IDM_DRIVE_ROM_SETTINGS)
+ ITEM(IDMS_RAM_SETTINGS, NULL, IDM_RAM_SETTINGS)
+ ITEM(IDMS_C64DTV_SETTINGS, NULL, IDM_C64DTV_SETTINGS)
+ ITEMSEPARATOR()
+ ITEM(IDMS_SAVE_CURRENT_SETTINGS, NULL, IDM_SETTINGS_SAVE)
+ ITEM(IDMS_LOAD_SAVED_SETTINGS, NULL, IDM_SETTINGS_LOAD)
+ ITEM(IDMS_SET_DEFAULT_SETTINGS, NULL, IDM_SETTINGS_DEFAULT)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_SAVE_SETTING_ON_EXIT, NULL, IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT)
+ ITEMTOGGLE(IDMS_CONFIRM_ON_EXIT, NULL, IDM_TOGGLE_CONFIRM_ON_EXIT)
+ TITLE(IDMS_LANGUAGE, NULL)
+ ITEM(IDMS_LANGUAGE_ENGLISH, NULL, IDM_LANGUAGE_ENGLISH)
+ ITEM(IDMS_LANGUAGE_GERMAN, NULL, IDM_LANGUAGE_GERMAN)
+ ITEM(IDMS_LANGUAGE_FRENCH, NULL, IDM_LANGUAGE_FRENCH)
+ ITEM(IDMS_LANGUAGE_HUNGARIAN, NULL, IDM_LANGUAGE_HUNGARIAN)
+ ITEM(IDMS_LANGUAGE_ITALIAN, NULL, IDM_LANGUAGE_ITALIAN)
+ ITEM(IDMS_LANGUAGE_DUTCH, NULL, IDM_LANGUAGE_DUTCH)
+ ITEM(IDMS_LANGUAGE_POLISH, NULL, IDM_LANGUAGE_POLISH)
+ ITEM(IDMS_LANGUAGE_SWEDISH, NULL, IDM_LANGUAGE_SWEDISH)
+ TITLE(IDMS_HELP, NULL)
+ ITEM(IDMS_ABOUT, NULL, IDM_ABOUT)
+ ITEMSEPARATOR()
+ ITEM(IDMS_COMMAND_LINE_OPTIONS, NULL, IDM_CMDLINE)
+ ITEMSEPARATOR()
+ ITEM(IDMS_CONTRIBUTORS, NULL, IDM_CONTRIBUTORS)
+ ITEM(IDMS_LICENSE, NULL, IDM_LICENSE)
+ ITEM(IDMS_NO_WARRANTY, NULL, IDM_WARRANTY)
+ END()
+};
+
+static struct NewMenu UI_TRANSLATED_MENU_NAME[sizeof(UI_MENU_NAME)/sizeof(UI_MENU_NAME[0])];
+
+#endif /* _C64UIRES_H_ */
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c 2008-07-31 00:07:16 UTC (rev 19087)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c 2008-07-31 11:21:37 UTC (rev 19088)
@@ -1,33 +1,33 @@
-/*
- * x64dtvns.c - No Sound x64dtv launcher.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(void)
-{
- return system("x64dtv.exe -sounddev dummy");
-}
+/*
+ * x64dtvns.c - No Sound x64dtv launcher.
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(void)
+{
+ return system("x64dtv.exe -sounddev dummy");
+}
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/c64dtvui.cc
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/c64dtvui.c
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc 2008-07-31 00:07:16 UTC (rev 19087)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc 2008-07-31 11:21:37 UTC (rev 19088)
@@ -1,11 +1,11 @@
-source type(c)
- "c64bus.c",
- "c64drive.c",
- "c64fastiec.c",
- "c64keyboard.c",
- "c64parallel.c",
- "c64printer.c",
- "c64rom.c",
- "c64rsuser.c",
- "c64video.c",
- "patchrom.c"
+source type(c)
+ "c64bus.c",
+ "c64drive.c",
+ "c64fastiec.c",
+ "c64keyboard.c",
+ "c64parallel.c",
+ "c64printer.c",
+ "c64rom.c",
+ "c64rsuser.c",
+ "c64video.c",
+ "patchrom.c"
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64dtv.icc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64dtv.icc 2008-07-31 00:07:16 UTC (rev 19087)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64dtv.icc 2008-07-31 11:21:37 UTC (rev 19088)
@@ -1,22 +1,22 @@
-source type(c)
- "c64dtvcart.c",
- "c64dtvtfe.c",
- "c64dtvmemsnapshot.c",
- "c64dtvmem.c",
- "c64dtvmemrom.c",
- "c64dtvcpu.c",
- "c64dtvblitter.c",
- "c64dtvdma.c",
- "c64dtvflash.c",
- "c64dtv-cmdline-options.c",
- "c64dtv-resources.c",
- "c64dtv-snapshot.c",
- "c64dtv.c",
- "c64dtvcia1.c",
- "c64dtvcia2.c",
- "c64dtviec.c",
- "c64dtvmeminit.c",
- "c64dtvpla.c",
- "c64dtvsound.c",
- "flash-trap.c",
- "hummeradc.c"
+source type(c)
+ "c64dtvcart.c",
+ "c64dtvtfe.c",
+ "c64dtvmemsnapshot.c",
+ "c64dtvmem.c",
+ "c64dtvmemrom.c",
+ "c64dtvcpu.c",
+ "c64dtvblitter.c",
+ "c64dtvdma.c",
+ "c64dtvflash.c",
+ "c64dtv-cmdline-options.c",
+ "c64dtv-resources.c",
+ "c64dtv-snapshot.c",
+ "c64dtv.c",
+ "c64dtvcia1.c",
+ "c64dtvcia2.c",
+ "c64dtviec.c",
+ "c64dtvmeminit.c",
+ "c64dtvpla.c",
+ "c64dtvsound.c",
+ "flash-trap.c",
+ "hummeradc.c"
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64dtv.icc
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/viciidtv.icc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/viciidtv.icc 2008-07-31 00:07:16 UTC (rev 19087)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/viciidtv.icc 2008-07-31 11:21:37 UTC (rev 19088)
@@ -1,14 +1,14 @@
-source type(c)
- "vicii-badline.c",
- "vicii-cmdline-options.c",
- "viciidtv-color.c",
- "viciidtv-draw.c",
- "vicii-fetch.c",
- "vicii-irq.c",
- "vicii-mem.c",
- "vicii-phi1.c",
- "vicii-resources.c",
- "viciidtv-snapshot.c",
- "vicii-sprites.c",
- "vicii-timing.c",
- "vicii.c"
+source type(c)
+ "vicii-badline.c",
+ "vicii-cmdline-options.c",
+ "viciidtv-color.c",
+ "viciidtv-draw.c",
+ "vicii-fetch.c",
+ "vicii-irq.c",
+ "vicii-mem.c",
+ "vicii-phi1.c",
+ "vicii-resources.c",
+ "viciidtv-snapshot.c",
+ "vicii-sprites.c",
+ "vicii-timing.c",
+ "vicii.c"
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/viciidtv.icc
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64common.tgt
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ CRLF
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64dtv.tgt
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ CRLF
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64dtvc64.tgt
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ CRLF
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/viciicommon.tgt
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ CRLF
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/viciidtv.tgt
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ CRLF
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-specific.tgt
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ CRLF
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv.tgt
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ CRLF
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/uic64dtv.c
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/uic64dtv.h
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-31 00:07:10
|
Revision: 19087
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19087&view=rev
Author: blackystardust
Date: 2008-07-31 00:07:16 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
Updated the OS/2 VAC++ project files for x64dtv.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/install.cmd
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/makedist.cmd
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/monitor.icc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/vicii.icc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x128/X128.ICC
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x64/X64.ICC
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/xcbm2/Xcbm2.ICC
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64dtv.icc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/viciidtv.icc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x64dtv/
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x64dtv/X64DTV.ICC
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/install.cmd
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/install.cmd 2008-07-30 17:26:55 UTC (rev 19086)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/install.cmd 2008-07-31 00:07:16 UTC (rev 19087)
@@ -57,6 +57,7 @@
say 'Creating Program objects...'
CALL createProgram "C=64", 'x64.exe', '*.d64,*.d64.gz,*.d64.zip,*.g64,*.g64.gz,*.g64.zip,*.x64,*.x64.gz,*.x64.zip,*.t64,*.t64.gz,*.d64.zip,*.tap,*.tap.gz'
+CALL createProgram "C=64DTV", 'x64dtv.exe', '*.d64,*.d64.gz,*.d64.zip,*.g64,*.g64.gz,*.g64.zip,*.x64,*.x64.gz,*.x64.zip,*.t64,*.t64.gz,*.d64.zip,*.tap,*.tap.gz'
CALL createProgram "C=128", 'x128.exe', '*.d71,*.d71.gz,*.d81,*.d81.gz'
CALL createProgram "VIC 20", 'xvic.exe', ''
CALL createProgram "PET", 'xpet.exe', '*.d80,*.d80.gz,*.d80.zip,*.d82,*.d82.gz,*.d82.zip'
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/makedist.cmd
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/makedist.cmd 2008-07-30 17:26:55 UTC (rev 19086)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/makedist.cmd 2008-07-31 00:07:16 UTC (rev 19087)
@@ -7,6 +7,7 @@
md "Vice2"
type install.cmd > Vice2\install.cmd
copy ..\..\..\data\x64.exe Vice2
+copy ..\..\..\data\x64dtv.exe Vice2
copy ..\..\..\data\x128.exe Vice2
copy ..\..\..\data\xvic.exe Vice2
copy ..\..\..\data\xpet.exe Vice2
@@ -40,6 +41,22 @@
copy ..\..\..\data\C64\pc64.vpl Vice2\C64
copy ..\..\..\data\C64\vice.vpl Vice2\C64
+md Vice2\C64DTV
+copy ..\..\..\data\C64DTV\basic Vice2\C64DTV
+copy ..\..\..\data\C64DTV\c64mem.sym Vice2\C64DTV
+copy ..\..\..\data\C64DTV\c64s.vpl Vice2\C64DTV
+copy ..\..\..\data\C64DTV\ccs64.vpl Vice2\C64DTV
+copy ..\..\..\data\C64DTV\chargen Vice2\C64DTV
+copy ..\..\..\data\C64DTV\default.vpl Vice2\C64DTV
+copy ..\..\..\data\C64DTV\default.vrs Vice2\C64DTV
+copy ..\..\..\data\C64DTV\frodo.vpl Vice2\C64DTV
+copy ..\..\..\data\C64DTV\godot.vpl Vice2\C64DTV
+copy ..\..\..\data\C64DTV\kernal Vice2\C64DTV
+copy ..\..\..\data\C64DTV\os2.vkm Vice2\C64DTV
+copy ..\..\..\data\C64DTV\os2_sym.vkm Vice2\C64DTV
+copy ..\..\..\data\C64DTV\pc64.vpl Vice2\C64DTV
+copy ..\..\..\data\C64DTV\vice.vpl Vice2\C64DTV
+
md Vice2\C128
copy ..\..\..\data\C128\basic64 Vice2\C128
copy ..\..\..\data\C128\basiclo Vice2\C128
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/Makefile.am 2008-07-30 17:26:55 UTC (rev 19086)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/Makefile.am 2008-07-31 00:07:16 UTC (rev 19087)
@@ -1,5 +1,6 @@
EXTRA_DIST = \
x64/X64.ICC \
+ x64dtv/X64DTV.ICC \
x128/X128.ICC \
X1541.ICC \
cartconv.ICC \
@@ -21,6 +22,8 @@
incl/c128.icc \
incl/c64.icc \
incl/c64cart.icc \
+ incl/c64commonc64dtv.icc \
+ incl/c64dtv.icc \
incl/cbm2.icc \
incl/core.icc \
incl/crtc.icc \
@@ -57,6 +60,7 @@
incl/vdrive.icc \
incl/vic20.icc \
incl/vicii.icc \
+ incl/viciidtv.icc \
incl/video.icc \
incl/vsid.icc \
ctools/biosdump.icc \
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc 2008-07-31 00:07:16 UTC (rev 19087)
@@ -0,0 +1,11 @@
+source type(c)
+ "c64bus.c",
+ "c64drive.c",
+ "c64fastiec.c",
+ "c64keyboard.c",
+ "c64parallel.c",
+ "c64printer.c",
+ "c64rom.c",
+ "c64rsuser.c",
+ "c64video.c",
+ "patchrom.c"
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64dtv.icc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64dtv.icc (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64dtv.icc 2008-07-31 00:07:16 UTC (rev 19087)
@@ -0,0 +1,22 @@
+source type(c)
+ "c64dtvcart.c",
+ "c64dtvtfe.c",
+ "c64dtvmemsnapshot.c",
+ "c64dtvmem.c",
+ "c64dtvmemrom.c",
+ "c64dtvcpu.c",
+ "c64dtvblitter.c",
+ "c64dtvdma.c",
+ "c64dtvflash.c",
+ "c64dtv-cmdline-options.c",
+ "c64dtv-resources.c",
+ "c64dtv-snapshot.c",
+ "c64dtv.c",
+ "c64dtvcia1.c",
+ "c64dtvcia2.c",
+ "c64dtviec.c",
+ "c64dtvmeminit.c",
+ "c64dtvpla.c",
+ "c64dtvsound.c",
+ "flash-trap.c",
+ "hummeradc.c"
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/c64dtv.icc
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/monitor.icc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/monitor.icc 2008-07-30 17:26:55 UTC (rev 19086)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/monitor.icc 2008-07-31 00:07:16 UTC (rev 19087)
@@ -1,5 +1,6 @@
source type(c)
"asm6502.c",
+ "asm6502dtv.c",
"monitor.c",
"mon_assemble6502.c",
"mon_breakpoint.c",
@@ -9,6 +10,7 @@
"mon_file.c",
"mon_memory.c",
"mon_register6502.c",
+ "mon_register6502dtv.c",
"mon_ui.c",
"mon_util.c"
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/vicii.icc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/vicii.icc 2008-07-30 17:26:55 UTC (rev 19086)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/vicii.icc 2008-07-31 00:07:16 UTC (rev 19087)
@@ -11,4 +11,5 @@
"vicii-snapshot.c",
"vicii-sprites.c",
"vicii-timing.c",
- "vicii.c"
+ "vicii.c",
+ "vicii-stubs.c"
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/viciidtv.icc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/viciidtv.icc (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/viciidtv.icc 2008-07-31 00:07:16 UTC (rev 19087)
@@ -0,0 +1,14 @@
+source type(c)
+ "vicii-badline.c",
+ "vicii-cmdline-options.c",
+ "viciidtv-color.c",
+ "viciidtv-draw.c",
+ "vicii-fetch.c",
+ "vicii-irq.c",
+ "vicii-mem.c",
+ "vicii-phi1.c",
+ "vicii-resources.c",
+ "viciidtv-snapshot.c",
+ "vicii-sprites.c",
+ "vicii-timing.c",
+ "vicii.c"
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/incl/viciidtv.icc
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x128/X128.ICC
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x128/X128.ICC 2008-07-30 17:26:55 UTC (rev 19086)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x128/X128.ICC 2008-07-31 00:07:16 UTC (rev 19087)
@@ -16,6 +16,7 @@
incl(searchpath, "..\\..\\..\\.."),
incl(searchpath, "..\\..\\..\\..\\c128"),
incl(searchpath, "..\\..\\..\\..\\c64"),
+ incl(searchpath, "..\\..\\..\\..\\c64dtv"),
incl(searchpath, "..\\..\\..\\..\\core"),
incl(searchpath, "..\\..\\..\\..\\diskimage"),
incl(searchpath, "..\\..\\..\\..\\drive"),
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x64/X64.ICC
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x64/X64.ICC 2008-07-30 17:26:55 UTC (rev 19086)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x64/X64.ICC 2008-07-31 00:07:16 UTC (rev 19087)
@@ -15,6 +15,7 @@
incl(searchpath, "..\\..\\dialogs"),
incl(searchpath, "..\\..\\..\\.."),
incl(searchpath, "..\\..\\..\\..\\c64"),
+ incl(searchpath, "..\\..\\..\\..\\c64dtv"),
incl(searchpath, "..\\..\\..\\..\\core"),
incl(searchpath, "..\\..\\..\\..\\diskimage"),
incl(searchpath, "..\\..\\..\\..\\drive"),
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x64dtv/X64DTV.ICC
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x64dtv/X64DTV.ICC (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/x64dtv/X64DTV.ICC 2008-07-31 00:07:16 UTC (rev 19087)
@@ -0,0 +1,91 @@
+option ProjectOptions = link(linkwithmultithreadlib, "yes"),
+ link(pmtype, "pm"), gen(arch, "pentium"),
+ link(debug, "no"), gen(debug, "yes"),
+ opt(level, "2"), opt(tune, "pentium"),
+ opt(autoinline, "yes"), opt(inline, "yes"),
+ info(cnd, "no"), info(ppc, "no"),
+ info(ppt, "no"), file(genobject, "Yes"),
+ file(genpch, "no"), file(usepch, "no"),
+ define("HAVE_CONFIG_H", ),
+ incl(searchpath, "."),
+ incl(searchpath, ".."),
+ incl(searchpath, "..\\.."),
+ incl(searchpath, "..\\..\\ui"),
+ incl(searchpath, "..\\..\\kbd"),
+ incl(searchpath, "..\\..\\dialogs"),
+ incl(searchpath, "..\\..\\..\\.."),
+ incl(searchpath, "..\\..\\..\\..\\c64"),
+ incl(searchpath, "..\\..\\..\\..\\c64dtv"),
+ incl(searchpath, "..\\..\\..\\..\\core"),
+ incl(searchpath, "..\\..\\..\\..\\diskimage"),
+ incl(searchpath, "..\\..\\..\\..\\drive"),
+ incl(searchpath, "..\\..\\..\\..\\fileio"),
+ incl(searchpath, "..\\..\\..\\..\\fsdevice"),
+ incl(searchpath, "..\\..\\..\\..\\gfxoutputdrv"),
+ incl(searchpath, "..\\..\\..\\..\\iecbus"),
+ incl(searchpath, "..\\..\\..\\..\\imagecontents"),
+ incl(searchpath, "..\\..\\..\\..\\lib\\zlib"),
+ incl(searchpath, "..\\..\\..\\..\\lib\\lpng"),
+ incl(searchpath, "..\\..\\..\\..\\monitor"),
+ incl(searchpath, "..\\..\\..\\..\\parallel"),
+ incl(searchpath, "..\\..\\..\\..\\printerdrv"),
+ incl(searchpath, "..\\..\\..\\..\\raster"),
+ incl(searchpath, "..\\..\\..\\..\\rs232drv"),
+ incl(searchpath, "..\\..\\..\\..\\serial"),
+ incl(searchpath, "..\\..\\..\\..\\sid"),
+ incl(searchpath, "..\\..\\..\\..\\sounddrv"),
+ incl(searchpath, "..\\..\\..\\..\\tape"),
+ incl(searchpath, "..\\..\\..\\..\\vdrive"),
+ incl(searchpath, "..\\..\\..\\..\\vicii"),
+ incl(searchpath, "..\\..\\..\\..\\video"),
+ incl(searchpathfirst, "yes"),
+ define("__X64DTV__", ),
+ res_rc_options("-i ..\\..\\dialogs -d __X64DTV__ -dC64DTV -x1")
+{
+ target type(exe) "..\\..\\..\\..\\..\\data\\x64dtv.exe"
+ {
+ source type (lib)
+ "mmpm2.lib", // "zlib.lib", "png.lib"
+ "..\\..\\..\\..\\..\\data\\vice2.lib"/*,
+ "..\\..\\..\\..\\..\\data\\ipspy.lib"*/
+
+ source type(c)
+ "ps2mouse.c",
+ "mousedrv.c",
+ "kbd-c64dtv.c",
+ "c64romset.c",
+ "dialogs\\dlg-color.c"
+
+ include "../incl/archdep.icc"
+ include "../incl/c64commonc64dtv.icc"
+ include "../incl/c64dtv.icc"
+ include "../incl/core.icc"
+ include "../incl/dialogs.icc"
+ include "../incl/diskimage.icc"
+ include "../incl/drive.icc"
+ include "../incl/fileio.icc"
+ include "../incl/fsdevice.icc"
+ include "../incl/gfxoutputdrv.icc"
+ include "../incl/iec.icc"
+ include "../incl/iecbus.icc"
+ include "../incl/iecc64exp.icc"
+ include "../incl/iecieee.icc"
+ include "../incl/ieee.icc"
+ include "../incl/imagecontents.icc"
+ include "../incl/kbd.icc"
+ include "../incl/mainsrc.icc"
+ include "../incl/monitor.icc"
+ include "../incl/parallel.icc"
+ include "../incl/printerdrv.icc"
+ include "../incl/resid.icc"
+ include "../incl/serial.icc"
+ include "../incl/tape.icc"
+ include "../incl/resources.icc"
+ include "../incl/raster.icc"
+ include "../incl/rs232drv.icc"
+ include "../incl/sounddrv.icc"
+ include "../incl/vdrive.icc"
+ include "../incl/viciidtv.icc"
+ include "../incl/video.icc"
+ }
+}
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/xcbm2/Xcbm2.ICC
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/xcbm2/Xcbm2.ICC 2008-07-30 17:26:55 UTC (rev 19086)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/xcbm2/Xcbm2.ICC 2008-07-31 00:07:16 UTC (rev 19087)
@@ -15,6 +15,7 @@
incl(searchpath, "..\\..\\dialogs"),
incl(searchpath, "..\\..\\..\\.."),
incl(searchpath, "..\\..\\..\\..\\c64"),
+ incl(searchpath, "..\\..\\..\\..\\c64dtv"),
incl(searchpath, "..\\..\\..\\..\\cbm2"),
incl(searchpath, "..\\..\\..\\..\\core"),
incl(searchpath, "..\\..\\..\\..\\crtc"),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-30 17:26:46
|
Revision: 19086
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19086&view=rev
Author: blackystardust
Date: 2008-07-30 17:26:55 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
Added a missing lib to the x64 OS/2 watcom project file.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/vice.wpj
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64.tgt
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/vice.wpj
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/vice.wpj 2008-07-30 08:58:13 UTC (rev 19085)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/vice.wpj 2008-07-30 17:26:55 UTC (rev 19086)
@@ -1287,7 +1287,7 @@
7
x64.tgt
0
-0
+4
262
VComponent
263
@@ -1421,7 +1421,7 @@
287
WRect
750
-733
+720
5700
4280
1
@@ -1431,7 +1431,7 @@
15
viciicommon.tgt
0
-0
+10
289
VComponent
290
@@ -1472,12 +1472,12 @@
320
5700
4280
+1
0
-0
297
WFileName
10
x64dtv.tgt
0
15
-103
+259
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64.tgt
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64.tgt 2008-07-30 08:58:13 UTC (rev 19085)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64.tgt 2008-07-30 17:26:55 UTC (rev 19086)
@@ -61,7 +61,7 @@
0
14
WPickList
-45
+46
15
MItem
3
@@ -828,8 +828,8 @@
0
186
MItem
-9
-video.lib
+15
+viciicommon.lib
187
WString
3
@@ -846,8 +846,8 @@
0
190
MItem
-8
-vsid.lib
+9
+video.lib
191
WString
3
@@ -864,8 +864,8 @@
0
194
MItem
-16
-x64-specific.lib
+8
+vsid.lib
195
WString
3
@@ -882,8 +882,8 @@
0
198
MItem
-20
-x64x128-specific.lib
+16
+x64-specific.lib
199
WString
3
@@ -900,8 +900,8 @@
0
202
MItem
-17
-xall-specific.lib
+20
+x64x128-specific.lib
203
WString
3
@@ -916,3 +916,21 @@
1
1
0
+206
+MItem
+17
+xall-specific.lib
+207
+WString
+3
+NIL
+208
+WVList
+0
+209
+WVList
+0
+42
+1
+1
+0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-30 08:58:08
|
Revision: 19085
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19085&view=rev
Author: blackystardust
Date: 2008-07-30 08:58:13 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
Updated the OS/2 UI and watcom project files for x64dtv.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dialogs.rc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dlg-fileio.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dragndrop.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.rc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/ui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/config.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vsyncarch.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128c64.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/config.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/monitor.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/vice.wpj
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/vicii.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x128.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/xcbm2.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/flash-trap.c
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/kbd/kbd-c64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64common.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64dtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64dtvc64.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/viciicommon.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/viciidtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-dlg-fileio.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-dragndrrop.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-main.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-menubar.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-specific.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-video.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-vsyncarch.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv.tgt
Removed Paths:
-------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64-snapshot.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64acia1.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64bus.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64cia2.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64datasette.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64export.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64iec.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64io.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64keyboard.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64meminit.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64memrom.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64parallel.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64pla.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64printer.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64rsuser.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64sound.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64tpi.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-digimax.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-georam.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-mmc64.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-patchrom.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-ramcart.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-reu.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-tfe.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/Makefile.am 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/Makefile.am 2008-07-30 08:58:13 UTC (rev 19085)
@@ -104,34 +104,13 @@
fonts/vice2.def \
fonts/vice2.rc \
watcom/archdep.tgt \
- watcom/c128-c64-snapshot.c \
- watcom/c128-c64acia1.c \
- watcom/c128-c64bus.c \
- watcom/c128-c64cia2.c \
- watcom/c128-c64datasette.c \
- watcom/c128-c64export.c \
- watcom/c128-c64iec.c \
- watcom/c128-c64io.c \
- watcom/c128-c64keyboard.c \
- watcom/c128-c64meminit.c \
- watcom/c128-c64memrom.c \
- watcom/c128-c64parallel.c \
- watcom/c128-c64pla.c \
- watcom/c128-c64printer.c \
- watcom/c128-c64rsuser.c \
- watcom/c128-c64sound.c \
- watcom/c128-c64tpi.c \
- watcom/c128-digimax.c \
- watcom/c128-georam.c \
- watcom/c128-mmc64.c \
- watcom/c128-patchrom.c \
- watcom/c128-ramcart.c \
- watcom/c128-reu.c \
- watcom/c128-tfe.c \
watcom/c128.tgt \
watcom/c128c64.tgt \
watcom/c64.tgt \
watcom/c64cart.tgt \
+ watcom/c64common.tgt \
+ watcom/c64dtv.tgt \
+ watcom/c64dtvc64.tgt \
watcom/cartconv.tgt \
watcom/cbm2.tgt \
watcom/config.h \
@@ -190,6 +169,8 @@
watcom/vic20.tgt \
watcom/vice.wpj \
watcom/vicii.tgt \
+ watcom/viciicommon.tgt \
+ watcom/viciidtv.tgt \
watcom/video.tgt \
watcom/vsid.tgt \
watcom/x128-dlg-fileio.c \
@@ -204,6 +185,14 @@
watcom/x1541.tgt \
watcom/x64-specific.tgt \
watcom/x64.tgt \
+ watcom/x64dtv-dlg-fileio.c \
+ watcom/x64dtv-dragndrrop.c \
+ watcom/x64dtv-main.c \
+ watcom/x64dtv-menubar.c \
+ watcom/x64dtv-specific.tgt \
+ watcom/x64dtv-video.c \
+ watcom/x64dtv-vsyncarch.c \
+ watcom/x64dtv.tgt \
watcom/x64x128-sid.c \
watcom/x64x128-specific.tgt \
watcom/xall-specific.tgt \
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dialogs.rc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dialogs.rc 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dialogs.rc 2008-07-30 08:58:13 UTC (rev 19085)
@@ -44,7 +44,7 @@
ICON PTR_NOTE "..\\..\\icons\\note.ico"
#endif
-#ifdef __X64__
+#if defined __X64__ || defined __X64DTV__
#ifdef WATCOM_COMPILE
ICON IDM_VICE2 "..\\icons\\x64.ico"
ICON DLG_VSID "..\\icons\\vsid.ico"
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dlg-fileio.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dlg-fileio.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dlg-fileio.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1241,3 +1241,38 @@
strcpy(path, dat);
}
+char *ViceFileSelect(HWND hwnd, int save)
+{
+ FILEDLG filedlg;
+ ULONG rc;
+
+ //
+ // Setup 'MUST' values
+ //
+ memset(&filedlg, 0, sizeof(FILEDLG)); // Initially set all fields to 0
+ filedlg.cbSize = sizeof(FILEDLG);
+
+ filedlg.fl = FDS_CENTER | FDS_CUSTOM | (save == 1) ? FDS_SAVEAS_DIALOG : FDS_OPEN_DIALOG;
+ filedlg.usDlgId = 0;
+ filedlg.pfnDlgProc = (PFNWP)NULL;
+ filedlg.pszTitle = (save == 1) ? "Save as" : "Open File";
+ filedlg.pszOKButton = (save == 1) ? "Save" : "Apply";
+ filedlg.pszIDrive = "c:";
+ filedlg.ulUser = 0L;
+
+ //
+ // let the file dialog do it's work
+ //
+ rc=WinFileDlg(HWND_DESKTOP, hwnd, &filedlg);
+
+ //
+ // if error or not 'Attach' button
+ //
+ if (!rc || filedlg.lReturn!=DID_OK)
+ return NULL;
+
+ //
+ // if the result was ok return the path
+ //
+ return lib_stralloc(filedlg.szFullFile[0]);
+}
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dragndrop.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dragndrop.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dragndrop.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -35,7 +35,7 @@
#include "machine.h" // vsid_mode
#include "resources.h"
#include "autostart.h" // autostart_autodetect
-#ifdef __X64__
+#if defined __X64__
#include "psid.h" // psid_init_driver
#endif
@@ -94,13 +94,13 @@
strcat(dir, nam);
-#ifdef __X64__
+#if defined __X64__
if (!vsid_mode)
{
#endif
if (autostart_autodetect(dir, NULL, 0, AUTOSTART_MODE_RUN) >= 0)
return NULL;
-#ifdef __X64__
+#if defined __X64__
}
else
{
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -119,7 +119,7 @@
#endif
#endif
/*
-#if defined __X64__ || defined __X128__ || defined __XVIC__ || defined __XPLUS4__
+#if defined __X64__ || defined __X128__ || defined __XVIC__ || defined __XPLUS4__ || defined __X64DTV__
static const char *VIDEO_CACHE="ViciiVideoCache";
#else // __XPET__ || __XCBM__
static const char *VIDEO_CACHE="CrtcVideoCache";
@@ -490,7 +490,7 @@
return;
#endif
-#if defined __X64__ || defined __X128__ || defined __XVIC__
+#if defined __X64__ || defined __X128__ || defined __XVIC__ || defined __X64DTV__
case IDM_PAL:
resources_set_int("MachineVideoStandard",
MACHINE_SYNC_PAL);
@@ -507,7 +507,7 @@
#endif // __X64__
#endif // __X64__ || __X128__ || __XVIC__
-#if defined __X64__ || defined __X128__
+#if defined __X64__ || defined __X128__ || defined __X64DTV__
/*
case IDM_KERNALREV0:
resources_set_string("KernalRev", "0");
@@ -568,6 +568,10 @@
resources_set_int("REUSize", (idm&0xff)<<7);
return;
+ case IDM_REUFILE:
+ resources_set_string("REUfilename", ViceFileSelect(hwnd, 1));
+ return;
+
case IDM_GEORAM64:
case IDM_GEORAM128:
case IDM_GEORAM256:
@@ -578,11 +582,19 @@
resources_set_int("GEORAMSize", (idm&0xff)<<6);
return;
+ case IDM_GEORAMFILE:
+ resources_set_string("GEORAMfilename", ViceFileSelect(hwnd, 1));
+ return;
+
case IDM_RAMCART64:
case IDM_RAMCART128:
resources_set_int("RAMCARTSize", (idm&0xf)<<6);
return;
+ case IDM_RAMCARTFILE:
+ resources_set_string("RAMCARTfilename", ViceFileSelect(hwnd, 1));
+ return;
+
case IDM_DIGIMAXDD00:
resources_set_int("DIGIMAXbase", 0xdd00);
return;
@@ -613,15 +625,54 @@
case IDM_PLUS60KD100:
resources_set_int("PLUS60Kbase", 0xd100);
return;
+
+ case IDM_PLUS60KFILE:
+ resources_set_string("PLUS60Kfilename", ViceFileSelect(hwnd, 1));
+ return;
+
+ case IDM_PLUS256KFILE:
+ resources_set_string("PLUS256Kfilename", ViceFileSelect(hwnd, 1));
+ return;
+
case IDM_C64_256K_BASEDE00:
case IDM_C64_256K_BASEDE80:
case IDM_C64_256K_BASEDF00:
case IDM_C64_256K_BASEDF80:
resources_set_int("C64_256Kbase", ((idm&3)*80)+0xde00);
return;
+
+ case IDM_C64_256KFILE:
+ resources_set_string("C64_256Kfilename", ViceFileSelect(hwnd, 1));
+ return;
#endif
#endif // __X64__ || __X128__
+#ifdef __X64DTV__
+ case IDM_C64DTV_FLASHROM_ATTACH:
+ resources_set_string("c64dtvromfilename", ViceFileSelect(hwnd, 0));
+ return;
+ case IDM_C64DTV_FLASHROM_DETACH:
+ resources_set_string("c64dtvromfilename", "");
+ return;
+ case IDM_C64DTV_FLASHROM_RW:
+ toggle("c64dtvromrw");
+ return;
+ case IDM_DTV2:
+ resources_set_int("DtvRevision", 2);
+ return;
+ case IDM_DTV3:
+ resources_set_int("DtvRevision", 3);
+ return;
+ case IDM_C64DTV_HUMMER_JOY:
+ toggle("HummerUserportJoy");
+ return;
+ case IDM_HUMMER_JOY1:
+ resources_set_int("HummerUserportJoyPort", 1);
+ return;
+ case IDM_HUMMER_JOY2:
+ resources_set_int("HummerUserportJoyPort", 2);
+ return;
+#endif
#ifdef __XPET__
case IDM_PETREU:
toggle("PETREU");
@@ -639,6 +690,10 @@
case IDM_PETREU2048:
resources_set_int("PETREUSize", 2048);
return;
+
+ case IDM_PETREUFILE:
+ resources_set_string("PETREUfilename", ViceFileSelect(hwnd, 1));
+ return;
#endif
#ifdef HAVE_MOUSE
case IDM_MOUSE:
@@ -1169,7 +1224,7 @@
case IDM_VIEW:
WinEnableMenuItem(hwnd, IDM_LOGWIN, hwndLog !=NULLHANDLE);
WinEnableMenuItem(hwnd, IDM_MONITOR, hwndMonitor!=NULLHANDLE);
-#if defined __X64__ || defined __X128__
+#if defined __X64__ || defined __X128__ || defined __X64DTV__
resources_get_int(EXTERNAL_PALETTE, &val);
WinEnableMenuItem(hwnd, IDM_COLOR, !val);
#endif
@@ -1183,7 +1238,7 @@
#endif
return;
-#if defined __X64__ || defined __X128__ || defined __XVIC__
+#if defined __X64__ || defined __X128__ || defined __XVIC__ || defined __X64DTV__
/*
//
// A change online is not possible yet.
@@ -1272,12 +1327,15 @@
resources_get_int("REU", &val);
WinCheckMenuItem(hwnd, IDM_REU, val);
WinEnableMenuItem(hwnd, IDM_REUSIZE, val);
+ WinEnableMenuItem(hwnd, IDM_REUFILE, val);
resources_get_int("GEORAM", &val);
WinCheckMenuItem(hwnd, IDM_GEORAM, val);
WinEnableMenuItem(hwnd, IDM_GEORAMSIZE, val);
+ WinEnableMenuItem(hwnd, IDM_GEORAMFILE, val);
resources_get_int("RAMCART", &val);
WinCheckMenuItem(hwnd, IDM_RAMCART, val);
WinEnableMenuItem(hwnd, IDM_RAMCARTSIZE, val);
+ WinEnableMenuItem(hwnd, IDM_RAMCARTFILE, val);
resources_get_int("DIGIMAX", &val);
WinCheckMenuItem(hwnd, IDM_DIGIMAX, val);
WinEnableMenuItem(hwnd, IDM_DIGIMAXBASE, val);
@@ -1286,16 +1344,26 @@
resources_get_int("PLUS60K", &val);
WinCheckMenuItem(hwnd, IDM_PLUS60K, val);
WinEnableMenuItem(hwnd, IDM_PLUS60KBASE, val);
+ WinEnableMenuItem(hwnd, IDM_PLUS60KFILE, val);
resources_get_int("PLUS256K", &val);
WinCheckMenuItem(hwnd, IDM_PLUS256K, val);
+ WinEnableMenuItem(hwnd, IDM_PLUS256KFILE, val);
resources_get_int("C64_256K", &val);
WinCheckMenuItem(hwnd, IDM_C64_256K, val);
WinEnableMenuItem(hwnd, IDM_C64_256K_BASE, val);
+ WinEnableMenuItem(hwnd, IDM_C64_256KFILE, val);
#endif
+#ifdef __X64DTV__
+ resources_get_int("c64dtvromrw", &val);
+ WinCheckMenuItem(hwnd, IDM_C64DTV_FLASHROM_RW, val);
+ resources_get_int("HummerUserportJoy", &val);
+ WinCheckMenuItem(hwnd, IDM_C64DTV_HUMMER_JOY, val);
+#endif
#ifdef __XPET__
resources_get_int("REU", &val);
- WinCheckMenuItem(hwnd, IDM_REU, val);
- WinEnableMenuItem(hwnd, IDM_REUSIZE, val);
+ WinCheckMenuItem(hwnd, IDM_PETREU, val);
+ WinEnableMenuItem(hwnd, IDM_PETREUSIZE, val);
+ WinEnableMenuItem(hwnd, IDM_PETREUFILE, val);
WinCheckRes(hwnd, IDM_CHARSET, "Basic1Chars");
WinCheckRes(hwnd, IDM_EOI, "EoiBlank");
WinCheckRes(hwnd, IDM_ROMPATCH, "Basic1");
@@ -1359,6 +1427,19 @@
return;
#endif
+#ifdef __X64DTV__
+ case IDM_C64DTV_REVISION:
+ resources_get_int("DtvRevision", &val);
+ WinCheckMenuItem(hwnd, IDM_DTV2, val==2);
+ WinCheckMenuItem(hwnd, IDM_DTV3, val==3);
+ return;
+ case IDM_C64DTV_HUMMER_MAPPED_JOY:
+ resources_get_int("HummerUserportJoyPort", &val);
+ WinCheckMenuItem(hwnd, IDM_HUMMER_JOY1, val==1);
+ WinCheckMenuItem(hwnd, IDM_HUMMER_JOY2, val==2);
+ return;
+#endif
+
#if defined __X64__ || defined __X128__
case IDM_REUSIZE:
resources_get_int("REUSize", &val);
@@ -1497,7 +1578,7 @@
}
return;
#endif // HAVE_RESID
-#if defined __X64__ || defined __X128__ || defined __XCBM__
+#if defined __X64__ || defined __X128__ || defined __XCBM__ || defined __X64DTV__
case IDM_SIDCHIP:
resources_get_int("SidModel", &val);
WinCheckMenuItem(hwnd, IDM_SC6581, val==0);
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.h 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.h 2008-07-30 08:58:13 UTC (rev 19085)
@@ -110,6 +110,17 @@
#define IDM_NTSC 0x147
#define IDM_NTSCOLD 0x148
+#define IDM_C64DTV_FLASHROM_ATTACH 0x1a4
+#define IDM_C64DTV_FLASHROM_DETACH 0x1a5
+#define IDM_C64DTV_FLASHROM_RW 0x1a6
+#define IDM_C64DTV_REVISION 0x1a7
+#define IDM_DTV2 0x1a8
+#define IDM_DTV3 0x1a9
+#define IDM_C64DTV_HUMMER_JOY 0x1aa
+#define IDM_C64DTV_HUMMER_MAPPED_JOY 0x1ab
+#define IDM_HUMMER_JOY1 0x1ac
+#define IDM_HUMMER_JOY2 0x1ad
+
#define IDM_REU 0x149
#define IDM_REUSIZE 0x150
#define IDM_REU128 0x601
@@ -120,6 +131,7 @@
#define IDM_REU4096 0x620
#define IDM_REU8192 0x640
#define IDM_REU16384 0x680
+#define IDM_REUFILE 0x14a
#define IDM_GEORAM 0x16b
#define IDM_GEORAMSIZE 0x16c
@@ -130,11 +142,13 @@
#define IDM_GEORAM1024 0x910
#define IDM_GEORAM2048 0x920
#define IDM_GEORAM4096 0x940
+#define IDM_GEORAMFILE 0x14b
#define IDM_RAMCART 0x16e
#define IDM_RAMCARTSIZE 0x16f
#define IDM_RAMCART64 0x941
#define IDM_RAMCART128 0x942
+#define IDM_RAMCARTFILE 0x14c
#define IDM_DIGIMAX 0x1a1
#define IDM_DIGIMAXBASE 0x1a2
@@ -160,8 +174,10 @@
#define IDM_PLUS60KBASE 0x17d
#define IDM_PLUS60KD040 0x17e
#define IDM_PLUS60KD100 0x17f
+#define IDM_PLUS60KFILE 0x14d
#define IDM_PLUS256K 0x18b
+#define IDM_PLUS256KFILE 0x14e
#define IDM_C64_256K 0x16d
#define IDM_C64_256K_BASE 0x16e
@@ -169,6 +185,7 @@
#define IDM_C64_256K_BASEDE80 0x18d
#define IDM_C64_256K_BASEDF00 0x18e
#define IDM_C64_256K_BASEDF80 0x18f
+#define IDM_C64_256KFILE 0x14f
#define IDM_PETREU 0x19b
#define IDM_PETREUSIZE 0x19c
@@ -176,6 +193,7 @@
#define IDM_PETREU512 0x19e
#define IDM_PETREU1024 0x19f
#define IDM_PETREU2048 0x1a0
+#define IDM_PETREUFILE 0x159
#define IDM_TFE 0x158
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.rc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.rc 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.rc 2008-07-30 08:58:13 UTC (rev 19085)
@@ -76,8 +76,10 @@
MENUITEM "~Cartridge", IDM_CARTRIDGEDET, MIS_TEXT
MENUITEM SEPARATOR
#endif
+#if !defined __X64DTV__
MENUITEM "~Tape", IDM_DETACHTAPE, MIS_TEXT
MENUITEM SEPARATOR
+#endif
MENUITEM "Disk ~8", IDM_DETACH8, MIS_TEXT
MENUITEM "Disk ~9", IDM_DETACH9, MIS_TEXT
MENUITEM "Disk 1~0", IDM_DETACH10, MIS_TEXT
@@ -85,6 +87,22 @@
MENUITEM SEPARATOR
MENUITEM "~All Disks", IDM_DETACHALL, MIS_TEXT
END
+#if defined __X64DTV__
+ MENUITEM "~Attach DTV flash ROM image", IDM_C64DTV_FLASHROM_ATTACH, MIS_TEXT
+ MENUITEM "~Detach DTV flash ROM image", IDM_C64DTV_FLASHROM_DETACH, MIS_TEXT
+ MENUITEM "DTV flash ROM image write enabled", IDM_C64DTV_FLASHROM_RW, MIS_TEXT
+ SUBMENU "DTV revision", IDM_C64DTV_REVISION, MIS_TEXT
+ BEGIN
+ MENUITEM "DTV~2", IDM_DTV2, MIS_TEXT
+ MENUITEM "DTV~3", IDM_DTV3, MIS_TEXT
+ END
+ MENUITEM "Enable Hummer userport joystick", IDM_C64DTV_HUMMER_JOY, MIS_TEXT
+ SUBMENU "Joyport mapped to userport", IDM_C64DTV_HUMMER_MAPPED_JOY, MIS_TEXT
+ BEGIN
+ MENUITEM "Joy~1", IDM_HUMMER_JOY1, MIS_TEXT
+ MENUITEM "Joy~2", IDM_HUMMER_JOY2, MIS_TEXT
+ END
+#endif
SUBMENU "~Fliplist", IDM_FLIPLIST, MIS_TEXT
BEGIN
MENUITEM "Drive #8 ~Next\tAlt-F", IDM_FLIPNEXT8, MIS_TEXT
@@ -129,7 +147,9 @@
MENUITEM "~Video Color Settings\tAlt-I", IDM_COLOR, MIS_TEXT
#endif
MENUITEM "~Joystick Setup\tAlt-J", IDM_JOYSTICK, MIS_TEXT
+#if !defined __X64DTV__
MENUITEM "Datasette ~Control\tAlt-C", IDM_DATASETTE, MIS_TEXT
+#endif
MENUITEM "~Logging Window\tAlt-L", IDM_LOGWIN, MIS_TEXT
MENUITEM "Buildin ~Monitor\tAlt-M", IDM_MONITOR, MIS_TEXT
END
@@ -196,7 +216,7 @@
MENUITEM "~64kB", IDM_VDC64K, MIS_TEXT
END
#endif
-#if defined __X64__ || defined __X128__ || defined __XVIC__
+#if defined __X64__ || defined __X64DTV__ || defined __X128__ || defined __XVIC__
SUBMENU "~Video Frequency Standard", IDM_VIDEOSTD, MIS_TEXT
BEGIN
MENUITEM "~PAL-G", IDM_PAL, MIS_TEXT
@@ -206,7 +226,7 @@
#endif // __X64__
END
#endif
-#if defined __X64__ || defined __X128__
+#if defined __X64__ || defined __X64DTV__ || defined __X128__
SUBMENU "Sprite Collision ~Detection", IDM_COLLISION, MIS_TEXT
BEGIN
MENUITEM "Sprite-~Sprite", IDM_SSCOLL, MIS_TEXT
@@ -392,6 +412,7 @@
MENUITEM "1~024kB", IDM_PETREU1024, MIS_TEXT
MENUITEM "~2048kB", IDM_PETREU2048, MIS_TEXT
END
+ MENUITEM "PET REU Filename", IDM_PETREUFILE, MIS_TEXT
#endif
#if defined __X64__ || defined __X128__
#ifdef HAVE_TFE
@@ -409,6 +430,7 @@
MENUITEM "81~92kB", IDM_REU8192, MIS_TEXT
MENUITEM "16~384kB", IDM_REU16384, MIS_TEXT
END
+ MENUITEM "REU Filename", IDM_REUFILE, MIS_TEXT
MENUITEM "G~EORAM - Memory Extension", IDM_GEORAM, MIS_TEXT
SUBMENU "GEORAM Memory ~Size", IDM_GEORAMSIZE, MIS_TEXT
BEGIN
@@ -420,12 +442,14 @@
MENUITEM "204~8kB", IDM_GEORAM2048, MIS_TEXT
MENUITEM "409~6kB", IDM_GEORAM4096, MIS_TEXT
END
+ MENUITEM "GEORAM Filename", IDM_GEORAMFILE, MIS_TEXT
MENUITEM "R~AMCART - Memory Expansion", IDM_RAMCART, MIS_TEXT
SUBMENU "RAMCART Memory ~Size", IDM_RAMCARTSIZE, MIS_TEXT
BEGIN
MENUITEM "~64kB", IDM_RAMCART64, MIS_TEXT
MENUITEM "~128kB", IDM_RAMCART128, MIS_TEXT
END
+ MENUITEM "RAMCART Filename", IDM_RAMCARTFILE, MIS_TEXT
MENUITEM "~DIGIMAX - Cartridge", IDM_DIGIMAX, MIS_TEXT
SUBMENU "DIGIMAX ~Base", IDM_DIGIMAXBASE, MIS_TEXT
BEGIN
@@ -455,7 +479,9 @@
MENUITEM "$~D040", IDM_PLUS60KD040, MIS_TEXT
MENUITEM "$D~100", IDM_PLUS60KD100, MIS_TEXT
END
+ MENUITEM "PLUS60K Filename", IDM_PLUS60KFILE, MIS_TEXT
MENUITEM "PLUS2~56K - Memory Expansion", IDM_PLUS60K, MIS_TEXT
+ MENUITEM "PLUS256K Filename", IDM_PLUS256KFILE, MIS_TEXT
MENUITEM "~256K - Memory Expansion", IDM_C64_256K, MIS_TEXT
SUBMENU "256K ~Base", IDM_C64_256K_BASE, MIS_TEXT
BEGIN
@@ -464,6 +490,7 @@
MENUITEM "$DF~00-$DF7F", IDM_C64_256K_BASEDF00, MIS_TEXT
MENUITEM "$D~F80-$DFFF", IDM_C64_256K_BASEDF80, MIS_TEXT
END
+ MENUITEM "256K Filename", IDM_C64_256KFILE, MIS_TEXT
#endif
#ifdef __X128__
SUBMENU "Machine Type", IDM_C128TYPE, MIS_TEXT
@@ -503,7 +530,7 @@
MENUITEM "~10%", IDM_VOL10, MIS_TEXT
END
MENUITEM SEPARATOR
-#if defined __X64__ || defined __X128__ || defined __XCBM__
+#if defined __X64__ || defined __X128__ || defined __XCBM__ || defined __X64DTV__
SUBMENU "SID ~Chip", IDM_SIDCHIP, MIS_TEXT
BEGIN
MENUITEM "~6581", IDM_SC6581, MIS_TEXT
@@ -619,7 +646,7 @@
"C", IDM_DATASETTE, ALT, SHIFT
"d", IDM_DRIVE, ALT
"D", IDM_DRIVE, ALT, SHIFT
-#if defined __X64__ || defined __X128__ || defined __XCBM__
+#if defined __X64__ || defined __X128__ || defined __XCBM__ || defined __X64DTV__
"i", IDM_COLOR, ALT
"I", IDM_COLOR, ALT, SHIFT
#endif
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/kbd/kbd-c64dtv.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/kbd/kbd-c64dtv.c (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/kbd/kbd-c64dtv.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -0,0 +1,192 @@
+/*
+ * c64dtvkbd.c -- C64DTV keyboard for MS-DOS.
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include "kbd.h"
+
+int c64_kbd_init(void)
+{
+// kbd_set_freeze_function(cartridge_trigger_freeze);
+ return kbd_init();
+}
+
+// ------------------ for further use ---------------------
+
+/*
+char *arr2sym(int col, int row, int vshift)
+{
+ keymap_t *k = keymap;
+
+ while (((k->key.col != col) || (k->key.row != row) ||
+ (k->key.vshift != vshift)) && k)
+ k++;
+
+ return k->sym;
+}
+
+keyconv *sym2arr(const char *c)
+{
+ keymap_t *k = keymap;
+
+ while (strcmp(c, k->sym) && k)
+ k++;
+
+ return &k->key;
+}
+
+
+struct _keymap
+{
+ char sym[10];
+ keyconv key;
+} keymap_t;
+
+// unshifted
+const char kbdlayout1[8][8][8] = {
+// col 0 1 2 3 4 5 6 7 // row
+ {"Del", "3", "5", "7", "9", "+", "Pound", "1"}, // 0
+ {"Return", "w", "r", "y", "i", "p", "*", "ArrowLt"}, // 1
+ {"CrsrRt", "a" "d", "g", "j", "l", ";", "Ctrl"}, // 2
+ {"F7", "4", "6", "8", "0", "-", "Home", "2"}, // 3
+ {"F1", "z", "c", "b", "m", ".", "RtShift", "Space"}, // 4
+ {"F3", "s", "f", "h", "k", ":", "=", "CBM"}, // 5
+ {"F5", "e", "t", "u", "o", "@", "ArrowUp", "q"}, // 6
+ {"CrsrDn", "", "x", "v", "n", ",", "/", "Stop"} // 7
+}
+
+// shifted
+const char kbdlayout2[8][8][8] = {
+// col 0 1 2 3 4 5 6 7 // row
+ {"Ins", "#", "%%", "'", ")", "+", "Pound", "!"}, // 0
+ {"Return", "W", "R", "Y", "I", "P", "*", "ArrowLt"}, // 1
+ {"CrsrLt", "A" "D", "G", "J", "L", ";", "Ctrl"}, // 2
+ {"F8", "$", "&", "(", "0", "-", "Home", "\""}, // 3
+ {"F2", "Z", "C", "B", "M", ".", "RtShift", "Space"}, // 4
+ {"F4", "S", "F", "H", "K", ":", "=", "CBM"}, // 5
+ {"F6", "E", "T", "U", "O", "@", "ArrowUp", "Q"}, // 6
+ {"CrsrUp", "", "X", "V", "N", ",", "/", "Stop"} // 7
+}
+
+const keymap_t keymap[] = {
+
+ // --- Unshifted ---
+
+ {"NoKey", {-1, -1, 0}},
+ {"Stop", {7, 7, 0}},
+ {"1", {7, 0, 0}},
+ {"2", {7, 3, 0}},
+ {"3", {1, 0, 0}},
+ {"4", {1, 3, 0}},
+ {"5", {2, 0, 0}},
+ {"6", {2, 3, 0}},
+ {"7", {3, 0, 0}},
+ {"8", {3, 3, 0}},
+ {"9", {4, 0, 0}},
+ {"0", {4, 3, 0}},
+ {"+", {5, 0, 0}},
+ {"-", {5, 3, 0}},
+ {"Del", {0, 0, 0}},
+ {"Ctrl", {7, 2, 0}},
+ {"Q", {7, 6, 0}},
+ {"W", {1, 1, 0}},
+ {"E", {1, 6, 0}},
+ {"R", {2, 1, 0}},
+ {"T", {2, 6, 0}},
+ {"Y", {3, 1, 0}},
+ {"U", {3, 6, 0}},
+ {"I", {4, 1, 0}},
+ {"O", {4, 6, 0}},
+ {"P", {5, 1, 0}},
+ {"@", {5, 6, 0}},
+ {"*", {6, 1, 0}},
+ {"Return", {0, 1, 0}},
+ {"CBM", {7, 5, 0}},
+ {"A", {1, 2, 0}},
+ {"S", {1, 5, 0}},
+ {"D", {2, 2, 0}},
+ {"F", {2, 5, 0}},
+ {"G", {3, 2, 0}},
+ {"H", {3, 5, 0}},
+ {"J", {4, 2, 0}},
+ {"K", {4, 5, 0}},
+ {"L", {5, 2, 0}},
+ {":", {5, 5, 0}},
+ {";", {6, 2, 0}},
+ {"ArrowLt", {7, 1, 0}},
+ {"=", {6, 5, 0}},
+ {"Z", {1, 4, 0}},
+ {"X", {2, 7, 0}},
+ {"C", {2, 4, 0}},
+ {"V", {3, 7, 0}},
+ {"B", {3, 4, 0}},
+ {"N", {4, 7, 0}},
+ {"M", {4, 4, 0}},
+ {",", {5, 7, 0}},
+ {".", {5, 4, 0}},
+ {"/", {6, 7, 0}},
+ {"RtShift", {6, 4, 0}},
+ {"Space", {7, 4, 0}},
+ {"F1", {0, 4, 0}},
+ {"F3", {0, 5, 0}},
+ {"F5", {0, 6, 0}},
+ {"F7", {0, 3, 0}},
+ {"Home", {6, 3, 0}},
+ {"CrsrRt", {0, 2, 0}},
+ {"CrsrDn", {0, 7, 0}},
+ {"Pound", {6, 0, 0}},
+ {"ArrowUp", {6, 6, 0}},
+
+ // --- Shifted ---
+
+ {"Run", {7, 7, 1}},
+ {"!", {7, 0, 1}},
+ {"\"", {7, 3, 1}},
+ {"#", {1, 0, 1}},
+ {"$", {1, 3, 1}},
+ {"%%", {2, 0, 1}},
+ {"&", {2, 3, 1}},
+ {"'", {3, 0, 1}},
+ {"(", {3, 3, 1}},
+ {")", {4, 0, 1}},
+ {"[", {5, 5, 1}},
+ {"]", {6, 2, 1}},
+ {"<", {5, 7, 1}},
+ {">", {5, 4, 1}},
+ {"?", {6, 7, 1}},
+ {"F2", {0, 4, 1}},
+ {"F4", {0, 5, 1}},
+ {"F6", {0, 6, 1}},
+ {"F8", {0, 3, 1}},
+ {"Pi", {6, 6, 1}},
+ {"Clr", {6, 3, 1}},
+ {"CrsrUp", {0, 7, 1}},
+ {"CrsrLt", {0, 2, 1}},
+ {"LtShift", {1, 7, 1}},
+ {"Ins", {0, 0, 1}},
+ {NULL, {-1, -1, 0}}
+}
+*/
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/ui.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/ui.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/ui.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -116,6 +116,11 @@
return 0;
}
+int c64dtvui_init(void)
+{
+ return 0;
+}
+
int c128ui_init(void)
{
return 0;
@@ -155,6 +160,10 @@
{
}
+void c64dtvui_shutdown(void)
+{
+}
+
void c128ui_shutdown(void)
{
}
@@ -335,6 +344,21 @@
lib_free(txt);
}
+void ui_message(const char *format,...)
+{
+ char *txt, *tmp;
+
+ va_list ap;
+ va_start(ap, format);
+ tmp = lib_mvsprintf(format, ap);
+ txt = util_concat(" Message from emulation thread:\n ", tmp, NULL);
+ lib_free(tmp);
+
+ ViceErrorDlg(HWND_DESKTOP, PTR_SKULL, txt);
+
+ lib_free(txt);
+}
+
ui_jam_action_t ui_jam_dialog(const char *format,...)
{
ULONG rc;
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/config.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/config.h 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/config.h 2008-07-30 08:58:13 UTC (rev 19085)
@@ -71,12 +71,12 @@
//#define HAVE_RS232 1
/* Do we want to enable the ReSID code support? */
-#if defined __X64__ || defined __X128__ || defined __XCBM__
+#if defined __X64__ || defined __X128__ || defined __XCBM__ || defined __X64DTV__
#define HAVE_RESID 1
#endif
/* Do we support a 1351 mouse? */
-#if defined __X64__ || defined __X128__
+#if defined __X64__ || defined __X128__ || defined __X64DTV__
#define HAVE_MOUSE 1
#endif
@@ -84,7 +84,7 @@
#define HAS_JOYSTICK 1
/* VIC II Doublesize/-scan */
-#if defined __X64__ || defined __X128__ || defined __XCBM__
+#if defined __X64__ || defined __X128__ || defined __XCBM__ || defined __X64DTV__
#define HAVE_VIC_II 1
#endif
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vsyncarch.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vsyncarch.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vsyncarch.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -155,11 +155,11 @@
//
// FIXME !!!
//
-#ifdef __X64__
+#if defined __X64__
if (!vsid_mode)
#endif
CanvasDisplaySpeed(speed+0.5, frame_rate+1, warp_enabled);
-#ifdef __X64__
+#if defined __X64__
else
WinSendMsg(hwndVsid, WM_DISPLAY,
(void*)(int)(speed+0.5), (void*)(int)(frame_rate+0.5));
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64-snapshot.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64-snapshot.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64-snapshot.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64-snapshot.c - Watcom c64-snapshot.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64-snapshot.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64acia1.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64acia1.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64acia1.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64acia1.c - Watcom c64acia1.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64acia1.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64bus.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64bus.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64bus.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64bus.c - Watcom c64bus.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64bus.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64cia2.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64cia2.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64cia2.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64cia2.c - Watcom c64cia2.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64cia2.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64datasette.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64datasette.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64datasette.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64datasette.c - Watcom c64datasette.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64datasette.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64export.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64export.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64export.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64export.c - Watcom c64export.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64export.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64iec.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64iec.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64iec.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64iec.c - Watcom c64iec.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64iec.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64io.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64io.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64io.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64io.c - Watcom c64io.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64io.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64keyboard.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64keyboard.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64keyboard.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64keyboard.c - Watcom c64keyboard.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64keyboard.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64meminit.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64meminit.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64meminit.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64meminit.c - Watcom c64meminit.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64meminit.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64memrom.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64memrom.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64memrom.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64memrom.c - Watcom c64memrom.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64memrom.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64parallel.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64parallel.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64parallel.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64parallel.c - Watcom c64parallel.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64parallel.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64pla.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64pla.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64pla.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64pla.c - Watcom c64pla.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64pla.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64printer.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64printer.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64printer.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64printer.c - Watcom c64printer.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64printer.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64rsuser.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64rsuser.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64rsuser.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64rsuser.c - Watcom c64rsuser.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64rsuser.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64sound.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64sound.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64sound.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64sound.c - Watcom c64sound.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64sound.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64tpi.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64tpi.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64tpi.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64tpi.c - Watcom c64tpi.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64tpi.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-digimax.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-digimax.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-digimax.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-digimax.c - Watcom digimax.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "digimax.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-georam.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-georam.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-georam.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-georam.c - Watcom georam.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part ...
[truncated message content] |
|
From: <fa...@us...> - 2008-07-27 16:42:26
|
Revision: 19084
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19084&view=rev
Author: fabbo
Date: 2008-07-27 16:42:35 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Did not compile with MinGW
Modified Paths:
--------------
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c 2008-07-26 22:12:00 UTC (rev 19083)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c 2008-07-27 16:42:35 UTC (rev 19084)
@@ -422,7 +422,7 @@
}
#ifdef WIN32
-#if HAVE_DINPUT
+#ifdef HAVE_DINPUT
if (!joy_di_init())
#endif
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-26 22:11:54
|
Revision: 19083
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19083&view=rev
Author: blackystardust
Date: 2008-07-26 22:12:00 +0000 (Sat, 26 Jul 2008)
Log Message:
-----------
Added BeOS UI for x64dtv.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/constants.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/make-bindist.sh
branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_file.cc
branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_file.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_sid.cc
branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/vicemenu.cc
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/c64dtvui.cc
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/Makefile.am 2008-07-26 09:24:47 UTC (rev 19082)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/Makefile.am 2008-07-26 22:12:00 UTC (rev 19083)
@@ -10,6 +10,7 @@
-I$(top_srcdir)/src/vdrive \
-I$(top_srcdir)/src/monitor \
-I$(top_srcdir)/src/c64 \
+ -I$(top_srcdir)/src/c64dtv \
-I$(top_srcdir)/src/c128 \
-I$(top_srcdir)/src/vic20 \
-I$(top_srcdir)/src/pet \
@@ -25,6 +26,7 @@
blockdev.c \
c128ui.cc \
c64ui.cc \
+ c64dtvui.cc \
cbm2ui.cc \
console.c \
constants.h \
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/c64dtvui.cc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/c64dtvui.cc (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/c64dtvui.cc 2008-07-26 22:12:00 UTC (rev 19083)
@@ -0,0 +1,119 @@
+/*
+ * c64dtvui.cc - C64DTV-specific user interface.
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <Alert.h>
+#include <Application.h>
+#include <FilePanel.h>
+#include <Menu.h>
+#include <MenuBar.h>
+#include <MenuItem.h>
+#include <ScrollView.h>
+#include <TextView.h>
+#include <View.h>
+#include <Window.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#if defined(__BEOS__) && defined(WORDS_BIGENDIAN)
+#include <string.h>
+#endif
+
+extern "C" {
+#include "archdep.h"
+#include "cartridge.h"
+#include "constants.h"
+#include "keyboard.h"
+#include "resources.h"
+#include "statusbar.h"
+#include "types.h"
+#include "ui.h"
+#include "ui_file.h"
+#include "ui_vicii.h"
+#include "util.h"
+#include "viceapp.h"
+#include "vicewindow.h"
+}
+
+extern ViceWindow *windowlist[];
+
+ui_menu_toggle c64dtv_ui_menu_toggles[]={
+ { "VICIIDoubleSize", MENU_TOGGLE_DOUBLESIZE },
+ { "VICIIDoubleScan", MENU_TOGGLE_DOUBLESCAN },
+ { "VICIIVideoCache", MENU_TOGGLE_VIDEOCACHE },
+ { "c64dtvromrw", MENU_TOGGLE_C64DTV_WRITE_ENABLE },
+ { "HummerUserportJoy", MENU_TOGGLE_HUMMER_USERPORT_JOY },
+ { "Mouse", MENU_TOGGLE_MOUSE },
+ { "ps2mouse", MENU_TOGGLE_PS2MOUSE },
+ { "PALEmulation", MENU_TOGGLE_FASTPAL },
+ { "VICIIScale2x", MENU_TOGGLE_SCALE2X },
+ { NULL, 0 }
+};
+
+ui_res_possible_values c64dtvviciiBorders[] = {
+ {0, MENU_VICII_BORDERS_NORMAL},
+ {1, MENU_VICII_BORDERS_FULL},
+ {2, MENU_VICII_BORDERS_DEBUG},
+ {-1, 0}
+};
+
+ui_res_value_list c64dtv_ui_res_values[] = {
+ {"DtvRevision", C64DTVRevision},
+ {"HummerUserportJoyPort", HummerJoyPort},
+ {"VICIIBorderMode", c64dtvviciiBorders},
+ {NULL,NULL}
+};
+
+void c64dtv_ui_specific(void *msg, void *window)
+{
+ switch (((BMessage*)msg)->what) {
+ case MENU_VICII_SETTINGS:
+ ui_vicii();
+ break;
+ case MENU_C64DTV_ROM_FILE:
+ ui_select_file(windowlist[0]->savepanel,C64DTV_ROM_FILE,(void*)0);
+ break;
+ default: ;
+ }
+}
+
+extern "C" {
+int c64dtvui_init(void)
+{
+ ui_register_machine_specific(c64dtv_ui_specific);
+ ui_register_menu_toggles(c64dtv_ui_menu_toggles);
+ ui_register_res_values(c64dtv_ui_res_values);
+ ui_update_menus();
+ return 0;
+}
+
+void c64dtvui_shutdown(void)
+{
+}
+
+}
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/constants.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/constants.h 2008-07-26 09:24:47 UTC (rev 19082)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/constants.h 2008-07-26 22:12:00 UTC (rev 19083)
@@ -134,6 +134,8 @@
const uint32 MENU_TOGGLE_MMC64_FLASHJUMPER = 'M057';
const uint32 MENU_TOGGLE_MMC64_SAVE = 'M068';
const uint32 MENU_TOGGLE_MMC64_READ_ONLY = 'M058';
+const uint32 MENU_TOGGLE_C64DTV_WRITE_ENABLE = 'M099';
+const uint32 MENU_TOGGLE_HUMMER_USERPORT_JOY = 'M105';
const uint32 MENU_TOGGLE_SIDCART = 'M085';
const uint32 MENU_TOGGLE_SIDCART_FILTERS = 'M086';
const uint32 MENU_TOGGLE_MOUSE = 'M110';
@@ -261,6 +263,14 @@
const uint32 MENU_MMC64_BIOS_FILE = 'M059';
const uint32 MENU_MMC64_IMAGE_FILE = 'M065';
+const uint32 MENU_C64DTV_REVISION_2 = 'M137';
+const uint32 MENU_C64DTV_REVISION_3 = 'M138';
+
+const uint32 MENU_HUMMER_JOY_PORT_1 = 'M139';
+const uint32 MENU_HUMMER_JOY_PORT_2 = 'M150';
+
+const uint32 MENU_C64DTV_ROM_FILE = 'M151';
+
const uint32 MENU_SOUND_RECORD_AIFF = 'M069';
const uint32 MENU_SOUND_RECORD_IFF = 'M080';
const uint32 MENU_SOUND_RECORD_MP3 = 'M081';
@@ -285,6 +295,8 @@
const uint32 MENU_VICII_BORDERS_FULL = 'M097';
const uint32 MENU_VICII_BORDERS_DEBUG = 'M098';
+const uint32 MENU_TOGGLE_PS2MOUSE = 'M152';
+
const uint32 MENU_MOUSE_TYPE_1351 = 'M153';
const uint32 MENU_MOUSE_TYPE_NEOS = 'M154';
const uint32 MENU_MOUSE_TYPE_AMIGA = 'M155';
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/make-bindist.sh
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/make-bindist.sh 2008-07-26 09:24:47 UTC (rev 19082)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/make-bindist.sh 2008-07-26 22:12:00 UTC (rev 19083)
@@ -12,7 +12,7 @@
ZIPKIND=$4
TOPSRCDIR=$5
-if [ ! -e src/x64 -o ! -e src/x128 -o ! -e src/xvic -o ! -e src/xpet -o ! -e src/xplus4 -o ! -e src/xcbm2 -o ! -e src/c1541 -o ! -e src/petcat -o ! -e src/cartconv ]
+if [ ! -e src/x64 -o ! -e src/x64dtv -o ! -e src/x128 -o ! -e src/xvic -o ! -e src/xpet -o ! -e src/xplus4 -o ! -e src/xcbm2 -o ! -e src/c1541 -o ! -e src/petcat -o ! -e src/cartconv ]
then
echo Error: executable file\(s\) not found, do a \"make\" first
exit 1
@@ -28,6 +28,7 @@
rm -f -r BeVICE-$VICEVERSION.$BEOSCPU
mkdir BeVICE-$VICEVERSION.$BEOSCPU
$STRIP src/x64
+$STRIP src/x64dtv
$STRIP src/x128
$STRIP src/xvic
$STRIP src/xpet
@@ -36,10 +37,10 @@
$STRIP src/c1541
$STRIP src/petcat
$STRIP src/cartconv
-cp src/x64 src/x128 src/xvic BeVICE-$VICEVERSION.$BEOSCPU
+cp src/x64 src/x64dtv src/x128 src/xvic BeVICE-$VICEVERSION.$BEOSCPU
cp src/xpet src/xplus4 src/xcbm2 BeVICE-$VICEVERSION.$BEOSCPU
cp src/c1541 src/petcat src/cartconv BeVICE-$VICEVERSION.$BEOSCPU
-cp -a data/C128 data/C64 data/CBM-II data/DRIVES BeVICE-$VICEVERSION.$BEOSCPU
+cp -a data/C128 data/C64 data/C64DTV data/CBM-II data/DRIVES BeVICE-$VICEVERSION.$BEOSCPU
cp -a data/PET data/PLUS4 data/PRINTER data/VIC20 BeVICE-$VICEVERSION.$BEOSCPU
cp -a data/fonts BeVICE-$VICEVERSION.$BEOSCPU
mkdir BeVICE-$VICEVERSION.$BEOSCPU/doc
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_file.cc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_file.cc 2008-07-26 09:24:47 UTC (rev 19082)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_file.cc 2008-07-26 22:12:00 UTC (rev 19083)
@@ -321,6 +321,8 @@
sprintf(title,"Select MMC64 BIOS file");
if (filetype == MMC64_IMAGE_FILE)
sprintf(title,"Select MMC64 image file");
+ if (filetype == C64DTV_ROM_FILE)
+ sprintf(title,"Select C64DTV ROM file");
if (filetype == AIFF_FILE)
sprintf(title,"Select AIFF Sound Recording file");
if (filetype == IFF_FILE)
@@ -418,6 +420,8 @@
BMessage *msg = new BMessage(PLAY_VSID);
msg->AddString("filename", path->Path());
ui_add_event(msg);
+ } else if (last_filetype[0] == C64DTV_ROM_FILE) {
+ resources_set_string("c64dtvromfilename", path->Path());
} else if (last_filetype[0] == MMC64_BIOS_FILE) {
resources_set_string("MMC64BIOSfilename", path->Path());
} else if (last_filetype[0] == MMC64_IMAGE_FILE) {
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_file.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_file.h 2008-07-26 09:24:47 UTC (rev 19082)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_file.h 2008-07-26 22:12:00 UTC (rev 19083)
@@ -52,6 +52,7 @@
PETREU_FILE,
MMC64_BIOS_FILE,
MMC64_IMAGE_FILE,
+ C64DTV_ROM_FILE,
AIFF_FILE,
IFF_FILE,
MP3_FILE,
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_sid.cc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_sid.cc 2008-07-26 09:24:47 UTC (rev 19082)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/ui_sid.cc 2008-07-26 22:12:00 UTC (rev 19083)
@@ -58,6 +58,9 @@
static char *sidmodel[] = {
"6581 (old)",
"8580 (new)",
+ "8580 (new+digiboost)",
+ "6581R4",
+ "DTVSID",
NULL
};
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/vicemenu.cc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/vicemenu.cc 2008-07-26 09:24:47 UTC (rev 19082)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/beos/vicemenu.cc 2008-07-26 22:12:00 UTC (rev 19083)
@@ -119,27 +119,29 @@
new BMessage(MENU_FLIP_PREVIOUS), 'N', B_CONTROL_KEY));
menu->AddSeparatorItem();
- menu->AddItem(new BMenuItem("Attach Tape",
- new BMessage(MENU_ATTACH_TAPE), 'T'));
- menu->AddItem(new BMenuItem("Detach Tape",
- new BMessage(MENU_DETACH_TAPE)));
+ if (machine_class != VICE_MACHINE_C64DTV) {
+ menu->AddItem(new BMenuItem("Attach Tape",
+ new BMessage(MENU_ATTACH_TAPE), 'T'));
+ menu->AddItem(new BMenuItem("Detach Tape",
+ new BMessage(MENU_DETACH_TAPE)));
- menu->AddItem(submenu = new BMenu("Datasette Control"));
- submenu->AddItem(new BMenuItem("Start",
- new BMessage(MENU_DATASETTE_START)));
- submenu->AddItem(new BMenuItem("Stop",
- new BMessage(MENU_DATASETTE_STOP)));
- submenu->AddItem(new BMenuItem("Forward",
- new BMessage(MENU_DATASETTE_FORWARD)));
- submenu->AddItem(new BMenuItem("Rewind",
- new BMessage(MENU_DATASETTE_REWIND)));
- submenu->AddItem(new BMenuItem("Record",
- new BMessage(MENU_DATASETTE_RECORD)));
- submenu->AddItem(new BMenuItem("Reset",
- new BMessage(MENU_DATASETTE_RESET)));
- submenu->AddItem(new BMenuItem("Reset Counter",
- new BMessage(MENU_DATASETTE_COUNTER)));
- menu->AddSeparatorItem();
+ menu->AddItem(submenu = new BMenu("Datasette Control"));
+ submenu->AddItem(new BMenuItem("Start",
+ new BMessage(MENU_DATASETTE_START)));
+ submenu->AddItem(new BMenuItem("Stop",
+ new BMessage(MENU_DATASETTE_STOP)));
+ submenu->AddItem(new BMenuItem("Forward",
+ new BMessage(MENU_DATASETTE_FORWARD)));
+ submenu->AddItem(new BMenuItem("Rewind",
+ new BMessage(MENU_DATASETTE_REWIND)));
+ submenu->AddItem(new BMenuItem("Record",
+ new BMessage(MENU_DATASETTE_RECORD)));
+ submenu->AddItem(new BMenuItem("Reset",
+ new BMessage(MENU_DATASETTE_RESET)));
+ submenu->AddItem(new BMenuItem("Reset Counter",
+ new BMessage(MENU_DATASETTE_COUNTER)));
+ menu->AddSeparatorItem();
+ }
if (machine_class == VICE_MACHINE_C64) {
menu->AddItem(submenu = new BMenu("Attach cartridge image"));
submenu->AddItem(new BMenuItem("CRT",
@@ -331,6 +333,7 @@
new BMessage(MENU_TOGGLE_FASTPAL), 'P', B_CONTROL_KEY));
}
if (machine_class == VICE_MACHINE_C64
+ || machine_class == VICE_MACHINE_C64DTV
|| machine_class == VICE_MACHINE_C128
|| machine_class == VICE_MACHINE_PLUS4
|| machine_class == VICE_MACHINE_VIC20) {
@@ -349,7 +352,9 @@
}
menu->AddSeparatorItem();
- if (machine_class == VICE_MACHINE_C128 || machine_class == VICE_MACHINE_C64) {
+ if (machine_class == VICE_MACHINE_C128
+ || machine_class == VICE_MACHINE_C64
+ || machine_class == VICE_MACHINE_C64DTV) {
menu->AddItem(submenu = new BMenu("VIC-II Border mode"));
submenu->SetRadioMode(true);
submenu->AddItem(new BMenuItem("Normal",
@@ -390,7 +395,8 @@
}
if (machine_class == VICE_MACHINE_C64
|| machine_class == VICE_MACHINE_C128
- || machine_class == VICE_MACHINE_VIC20) {
+ || machine_class == VICE_MACHINE_VIC20
+ || machine_class == VICE_MACHINE_C64DTV) {
menu->AddItem(submenu = new BMenu("Video Standard"));
submenu->SetRadioMode(true);
submenu->AddItem(new BMenuItem("PAL-G",
@@ -411,6 +417,7 @@
if (!vsid_mode) {
if (machine_class == VICE_MACHINE_C64
+ || machine_class == VICE_MACHINE_C64DTV
|| machine_class == VICE_MACHINE_C128) {
menu->AddSeparatorItem();
@@ -418,6 +425,34 @@
new BMessage(MENU_TOGGLE_EMUID)));
menu->AddItem(new BMenuItem("Grab mouse events",
new BMessage(MENU_TOGGLE_MOUSE)));
+ }
+ if (machine_class == VICE_MACHINE_C64DTV) {
+ menu->AddItem(new BMenuItem("PS/2 mouse",
+ new BMessage(MENU_TOGGLE_PS2MOUSE)));
+ menu->AddSeparatorItem();
+ menu->AddItem(submenu = new BMenu("C64DTV Options"));
+ submenu->AddItem(new BMenuItem("C64DTV ROM File",
+ new BMessage(MENU_C64DTV_ROM_FILE)));
+ submenu->AddItem(extsubmenu = new BMenu("C64DTV revision"));
+ extsubmenu->SetRadioMode(true);
+ extsubmenu->AddItem(new BMenuItem("DTV2",
+ new BMessage(MENU_C64DTV_REVISION_2)));
+ extsubmenu->AddItem(new BMenuItem("DTV3",
+ new BMessage(MENU_C64DTV_REVISION_3)));
+ submenu->AddItem(new BMenuItem("C64DTV ROM writable",
+ new BMessage(MENU_TOGGLE_C64DTV_WRITE_ENABLE)));
+ submenu->AddItem(new BMenuItem("Hummer Userport joystick",
+ new BMessage(MENU_TOGGLE_HUMMER_USERPORT_JOY)));
+ submenu->AddItem(extsubmenu = new BMenu("Joystick port mapped to Hummer Userport"));
+ extsubmenu->SetRadioMode(true);
+ extsubmenu->AddItem(new BMenuItem("Joy1",
+ new BMessage(MENU_HUMMER_JOY_PORT_1)));
+ extsubmenu->AddItem(new BMenuItem("Joy2",
+ new BMessage(MENU_HUMMER_JOY_PORT_2)));
+ }
+ if (machine_class == VICE_MACHINE_C64
+ || machine_class == VICE_MACHINE_C128) {
+
menu->AddItem(submenu = new BMenu("Mouse Options"));
submenu->AddItem(extsubmenu = new BMenu("Mouse Type"));
extsubmenu->SetRadioMode(true);
@@ -692,9 +727,12 @@
new BMessage(MENU_DEVICE_SETTINGS)));
menu->AddItem(new BMenuItem("Drive ...",
new BMessage(MENU_DRIVE_SETTINGS)));
- menu->AddItem(new BMenuItem("Datasette ...",
- new BMessage(MENU_DATASETTE_SETTINGS)));
+ if (machine_class != VICE_MACHINE_C64DTV) {
+ menu->AddItem(new BMenuItem("Datasette ...",
+ new BMessage(MENU_DATASETTE_SETTINGS)));
+ }
if (machine_class == VICE_MACHINE_C64
+ || machine_class == VICE_MACHINE_C64DTV
|| machine_class == VICE_MACHINE_C128) {
menu->AddItem(new BMenuItem("VIC-II ...",
new BMessage(MENU_VICII_SETTINGS)));
@@ -706,6 +744,7 @@
menu->AddItem(new BMenuItem("Sound ...",
new BMessage(MENU_SOUND_SETTINGS)));
if (machine_class == VICE_MACHINE_C64
+ || machine_class == VICE_MACHINE_C64DTV
|| machine_class == VICE_MACHINE_C128
|| machine_class == VICE_MACHINE_CBM2) {
menu->AddItem(new BMenuItem("SID ...",
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c 2008-07-26 09:24:47 UTC (rev 19082)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c 2008-07-26 22:12:00 UTC (rev 19083)
@@ -616,6 +616,7 @@
{
BYTE major_version, minor_version;
snapshot_module_t *m;
+ int temp_blitter_state;
/* Blitter module. */
m = snapshot_module_open(s, snap_blitter_module_name,
@@ -647,13 +648,15 @@
|| SMR_B(m, &sourceA) < 0
|| SMR_B(m, &sourceB) < 0
|| SMR_DW_INT(m, &blitter_count) < 0
- || SMR_DW_INT(m, (int *)&blitter_state) < 0
+ || SMR_DW_INT(m, &temp_blitter_state) < 0
|| SMR_DW_INT(m, &sourceA_line_off) < 0
|| SMR_DW_INT(m, &sourceB_line_off) < 0
|| SMR_DW_INT(m, &dest_line_off) < 0
|| SMR_B(m, &lastA) < 0)
goto fail;
+ blitter_state = temp_blitter_state;
+
if (snapshot_module_close(m) < 0)
goto fail;
m = NULL;
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c 2008-07-26 09:24:47 UTC (rev 19082)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c 2008-07-26 22:12:00 UTC (rev 19083)
@@ -506,6 +506,7 @@
{
BYTE major_version, minor_version;
snapshot_module_t *m;
+ int temp_dma_state;
/* DMA module. */
m = snapshot_module_open(s, snap_dma_module_name,
@@ -531,13 +532,15 @@
|| SMR_B(m, &dma_data) < 0
|| SMR_B(m, &dma_data_swap) < 0
|| SMR_DW_INT(m, &dma_count) < 0
- || SMR_DW_INT(m, (int *)&dma_state) < 0
+ || SMR_DW_INT(m, &temp_dma_state) < 0
|| SMR_DW_INT(m, &source_line_off) < 0
|| SMR_DW_INT(m, &dest_line_off) < 0
|| SMR_B(m, &source_memtype) < 0
|| SMR_B(m, &dest_memtype) < 0)
goto fail;
+ dma_state = temp_dma_state;
+
if (snapshot_module_close(m) < 0)
goto fail;
m = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cnv...@us...> - 2008-07-26 09:24:40
|
Revision: 19082
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19082&view=rev
Author: cnvogelg
Date: 2008-07-26 09:24:47 +0000 (Sat, 26 Jul 2008)
Log Message:
-----------
This patch fixes issues for Mac OS X compilation:
* The gnome UI code now can use old and new naming of GL_TEXTURE_RECTANGLE (ARB or NV)
* Gnome color handling now works on big endian machines, too
* Mac Gtk+/X11 are now compiled with the correct X11 libs/headers (e.g. when doing a compile on 10.5 for 10.4)
Added Paths:
-----------
tags/chris/v2.0-mac-ppc-x11-fixes/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cnv...@us...> - 2008-07-26 08:45:14
|
Revision: 19081
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19081&view=rev
Author: cnvogelg
Date: 2008-07-26 08:45:19 +0000 (Sat, 26 Jul 2008)
Log Message:
-----------
merged trunk [19021:19052] (2.0)
Modified Paths:
--------------
branches/chris/cocoa-port/vice/ChangeLog
branches/chris/cocoa-port/vice/configure.in
branches/chris/cocoa-port/vice/doc/Win32-Cygwin-HOWTO.txt
branches/chris/cocoa-port/vice/doc/html/index.html
branches/chris/cocoa-port/vice/doc/html/plain/NEWS
branches/chris/cocoa-port/vice/doc/vice.texi
branches/chris/cocoa-port/vice/po/ChangeLog
branches/chris/cocoa-port/vice/po/de.po
branches/chris/cocoa-port/vice/po/fr.po
branches/chris/cocoa-port/vice/po/hu.po
branches/chris/cocoa-port/vice/po/it.po
branches/chris/cocoa-port/vice/po/nl.po
branches/chris/cocoa-port/vice/po/pl.po
branches/chris/cocoa-port/vice/po/sv.po
branches/chris/cocoa-port/vice/src/ChangeLog
branches/chris/cocoa-port/vice/src/arch/amigaos/intl.c
branches/chris/cocoa-port/vice/src/arch/unix/gui/uipalemu.c
branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uipalcontrol.c
branches/chris/cocoa-port/vice/src/arch/win32/res.rc
branches/chris/cocoa-port/vice/src/arch/win32/resc128.rc
branches/chris/cocoa-port/vice/src/arch/win32/resc64.rc
branches/chris/cocoa-port/vice/src/arch/win32/rescbm2.rc
branches/chris/cocoa-port/vice/src/arch/win32/respet.rc
branches/chris/cocoa-port/vice/src/arch/win32/resplus4.rc
branches/chris/cocoa-port/vice/src/arch/win32/resvic20.rc
branches/chris/cocoa-port/vice/src/c64/tfe.c
branches/chris/cocoa-port/vice/src/translate.c
branches/chris/cocoa-port/vice/src/version.h
Modified: branches/chris/cocoa-port/vice/ChangeLog
===================================================================
--- branches/chris/cocoa-port/vice/ChangeLog 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/ChangeLog 2008-07-26 08:45:19 UTC (rev 19081)
@@ -1,3 +1,20 @@
+2008-07-18 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 2.0
+
+2008-07-18 Christian Vogelgsang <ch...@vo...>
+
+ * build/macosx/build-vice-release.sh: use provided autogen.sh
+
+ * doc/ReadmeMacOSX.txt: updated mac docs
+
+ * doc/html/macosx.html: Prepared for release of 2.0
+
+2008-07-17 Spiro Trikaliotis <spi...@gm...>
+
+ * doc/vice.texi, doc/html/plain/NEWS, doc/html/index.html,
+ doc/Win32-Cygwin-HOWTO.txt: Prepared for upcoming 2.0 release.
+
2008-07-16 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.27
Modified: branches/chris/cocoa-port/vice/configure.in
===================================================================
--- branches/chris/cocoa-port/vice/configure.in 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/configure.in 2008-07-26 08:45:19 UTC (rev 19081)
@@ -7,15 +7,15 @@
AC_INIT(src/maincpu.c)
-VICE_VERSION_MAJOR=1
-VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=27
+VICE_VERSION_MAJOR=2
+VICE_VERSION_MINOR=0
+VICE_VERSION_BUILD=0
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
AC_SUBST(VICE_VERSION_BUILD)
-AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
+dnl AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR
Modified: branches/chris/cocoa-port/vice/doc/Win32-Cygwin-HOWTO.txt
===================================================================
--- branches/chris/cocoa-port/vice/doc/Win32-Cygwin-HOWTO.txt 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/doc/Win32-Cygwin-HOWTO.txt 2008-07-26 08:45:19 UTC (rev 19081)
@@ -13,7 +13,7 @@
dependencies.
2. Obtain a copy of the VICE sources. Extract the vice-x.xx directory into
- your Cygwin user's home directory (e.g. /home/Owner/vice-1.22).
+ your Cygwin user's home directory (e.g. /home/Owner/vice-2.0).
3. Obtain DirectX 7 header files and libraries. It doesn't look like
Microsoft still makes this distribution available for download from its
@@ -46,7 +46,7 @@
make bindist
to make an executable distribution, which will appear in a directory
- called e.g. /home/Owner/vice-1.22/src/WinVICE-1.22. For development
+ called e.g. /home/Owner/vice-2.0/src/WinVICE-2.0. For development
purposes, no further installation is necessary; you can run the
executables directly from this directory.
Modified: branches/chris/cocoa-port/vice/doc/html/index.html
===================================================================
--- branches/chris/cocoa-port/vice/doc/html/index.html 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/doc/html/index.html 2008-07-26 08:45:19 UTC (rev 19081)
@@ -461,6 +461,11 @@
<a NAME="contact">Contacts
</h1>
+<p>VICE has moved its source repository to public services provided by
+<a href="http://sf.net/">SourceForge</a>. You can find it at <a
+href="http://sf.net/projects/vice-emu">http://sf.net/projects/vice-emu</a>.
+We like to thank the SourceForge staff for that help.</p>
+
<p>Before contacting us, have a look at the
<a href="http://vicekb.trikaliotis.net/">VICE knowledge base</a> if your
question is answered there. Keep in mind
@@ -473,8 +478,13 @@
<ul>
<li>
-Generic questions, bug reports, suggestions etc.: The Vice team
-(<a href="mailto:vic...@fi...">vic...@fi...</a>)
+Bug reports, suggestions, support requests should be directed to the
+SourceForge trackers at <a
+ href="http://sourceforge.net/tracker/?group_id=223021">http://sourceforge.net/tracker/?group_id=223021</a>.
+This way, you, the users, and we, the developers, can track what has
+been reported and what has been already fixed. Ideally, also sent the
+report to the mailing address of the Vice team at (<a
+ href="mailto:vic...@fi...">vic...@fi...</a>).
</li>
</ul>
Modified: branches/chris/cocoa-port/vice/doc/html/plain/NEWS
===================================================================
--- branches/chris/cocoa-port/vice/doc/html/plain/NEWS 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/doc/html/plain/NEWS 2008-07-26 08:45:19 UTC (rev 19081)
@@ -11,6 +11,12 @@
** General
----------
+- VICE development has moved to public services:
+ http://sf.net/projects/vice-emu
+ You can read the latest development in the Subversion
+ repository, file bug reports, and similar things.
+ Check it out!
+
- New Openserver 5.x, Openserver 6.x and Unixware ports.
- New AROS64 port.
@@ -51,6 +57,9 @@
NTSC sprites and sprites in full/debugging border mode (list
of fixed demos/games too long to mention here).
+- RESTORE key is handled differently now, fixing an NMI bug
+ because the NMI was asserted too long before.
+
** VIC20 changes
----------------
@@ -111,6 +120,9 @@
- Fixed volume slider behaviour when switching fullscreen mode.
+- Key repeat is eliminated OS-wise. This way, the RESTORE key is
+ not used with autorepeat.
+
** BeOS changes
---------------
Modified: branches/chris/cocoa-port/vice/doc/vice.texi
===================================================================
--- branches/chris/cocoa-port/vice/doc/vice.texi 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/doc/vice.texi 2008-07-26 08:45:19 UTC (rev 19081)
@@ -99,7 +99,7 @@
@ifinfo
-This is the documentation for version 1.20 of VICE, the Versatile
+This is the documentation for version 2.0 of VICE, the Versatile
Commodore Emulator.
@end ifinfo
Modified: branches/chris/cocoa-port/vice/po/ChangeLog
===================================================================
--- branches/chris/cocoa-port/vice/po/ChangeLog 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/po/ChangeLog 2008-07-26 08:45:19 UTC (rev 19081)
@@ -1,3 +1,25 @@
+2008-07-18 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 2.0
+
+2008-07-18 Spiro Trikaliotis <spi...@gm...>
+
+ * de.po: Fixed a typo ("StarDIS" -> "StarDOS").
+
+2008-07-18 pottendo <pot...@ao...>
+
+ * de.po: Updated.
+
+2008-07-16 Spiro Trikaliotis <spi...@gm...>
+
+ * de.po: Updated
+
+2008-07-16 Marco van den Heuvel <bla...@ya...>
+
+ * de.po, fr.po, hu.po, it.po, pl.po, sv.po: Removed the '#~' items.
+
+ * nl.po: Updated.
+
2008-07-08 Marco van den Heuvel <bla...@ya...>
* de.po, fr.po, hu.po, it.po, nl.po, pl.po, sv.po: Removed the
Modified: branches/chris/cocoa-port/vice/po/de.po
===================================================================
--- branches/chris/cocoa-port/vice/po/de.po 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/po/de.po 2008-07-26 08:45:19 UTC (rev 19081)
@@ -6,9 +6,9 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
-"PO-Revision-Date: 2008-01-02 16:46+0100\n"
-"Last-Translator: Martin Pottendorfer (pot...@ut...)\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
+"PO-Revision-Date: 2008-07-18 16:38+0200\n"
+"Last-Translator: pottendo (pot...@gm...)\n"
"Language-Team: de <de...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -104,7 +104,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -764,9 +764,8 @@
msgstr "16KB Action Replay Image III (raw) einlegen"
#: src/c64/cart/c64cart.c:261 src/translate.c.po.c:1502
-#, fuzzy
msgid "Attach raw 32KB Action Replay IV cartridge image"
-msgstr "32K Action Replay Image einlegen"
+msgstr "32K Action Replay Image IV einlegen"
#: src/c64/cart/c64cart.c:264 src/translate.c.po.c:1532
msgid "Attach raw 64KB Retro Replay cartridge image"
@@ -805,9 +804,8 @@
msgstr "Erweiterungsmodul Structured Basic (raw) Image einlegen"
#: src/c64/cart/c64cart.c:291 src/translate.c.po.c:1492
-#, fuzzy
msgid "Attach raw 16KB StarDOS cartridge image"
-msgstr "16KB Erweiterungsmodul (raw) Image einlegen"
+msgstr "16KB StarDOS Erweiterungsmodul Image einlegen"
#: src/c64/cart/c64cart.c:294 src/translate.c.po.c:1612
msgid "Enable expert cartridge"
@@ -999,23 +997,23 @@
msgid "Size of the RAM expansion unit"
msgstr "Gr\xF6\xDFe der RAM Speichererweiterung"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "TFE (\"the final ethernet\") Erweiterung aktivitieren"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "TFE (\"the final ethernet\") Erweiterung deaktivitieren"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr "Setze die System Ethernet Schnittstelle f\xFCr die TFE Emulation"
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
msgid "Enable RRNet mode of TFE emulation"
msgstr "RRNet Modus der TFE Emulation aktivieren"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
msgid "Disable RRNet mode of TFE emulation"
msgstr "RRNet Modus der TFE Emulation deaktivieren"
@@ -1983,17 +1981,16 @@
msgstr "Alte Helligkeitsemulation"
#: src/vicii/vicii-cmdline-options.c:126 src/translate.c.po.c:2716
-#, fuzzy
msgid "Set tint of internal calculated palette [1000]"
-msgstr "S\xE4ttigung f\xFCr intern berechneten Palette setzen [1000]"
+msgstr "Farbton f\xFCr intern berechneten Palette setzen [1000]"
#: src/vicii/vicii-cmdline-options.c:128 src/translate.c.po.c:2726
msgid "Set phase for color carrier in odd lines [1250]"
-msgstr ""
+msgstr "Phase f\xFCr Farbtr\xE4ger in ungeraden Zeilen setzen [1250]"
#: src/vicii/vicii-cmdline-options.c:130 src/translate.c.po.c:2736
msgid "Set phase offset for color carrier in odd lines [750]"
-msgstr ""
+msgstr "Phasenoffset f\xFCr Farbtr\xE4ger in ungeraden Zeilen setzen [750]"
#: src/video/video-cmdline-options.c:60 src/translate.c.po.c:3748
msgid "Enable double size"
@@ -3028,14 +3025,12 @@
msgstr "Action Replay Image III einlegen..."
#: src/arch/unix/gui/uic64cart.c:159
-#, fuzzy
msgid "Attach Action Replay IV image..."
-msgstr "Action Replay Image III einlegen..."
+msgstr "Action Replay Image IV einlegen..."
#: src/arch/unix/gui/uic64cart.c:162
-#, fuzzy
msgid "Attach StarDOS image..."
-msgstr "Band Image einlegen..."
+msgstr "StarDOS Image einlegen..."
#: src/arch/unix/gui/uic64cart.c:165
msgid "Attach Atomic Power image..."
@@ -3315,7 +3310,7 @@
msgstr "\xDCber VICE..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "Reset"
@@ -4127,34 +4122,31 @@
msgid "Scanline Shade in percent"
msgstr "Scanline Schatten in Prozent"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
-msgstr ""
+msgstr "PAL Farbton"
#: src/arch/unix/gui/uipalemu.c:88
-#, fuzzy
msgid "Tint in percent"
-msgstr "Scanline Schatten in Prozent"
+msgstr "Farbton in Prozent"
#: src/arch/unix/gui/uipalemu.c:95
msgid "New PAL Odd Line Phase"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
#: src/arch/unix/gui/uipalemu.c:95
-#, fuzzy
msgid "Phase in percent"
-msgstr "Passband Prozent"
+msgstr "Phase in Prozent"
#: src/arch/unix/gui/uipalemu.c:102
msgid "New PAL Odd Line Offset"
-msgstr ""
+msgstr "PAL ungerader Zeilenoffset"
#: src/arch/unix/gui/uipalemu.c:102
-#, fuzzy
msgid "Offset in percent"
-msgstr "Unsch\xE4rfe in Prozent"
+msgstr "Offset in Prozent"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr "PAL Unsch\xE4rfe"
@@ -4170,27 +4162,25 @@
msgid "*Fast PAL Emulation"
msgstr "*Schnelle PAL Emulation"
-#: src/arch/unix/gui/uipalemu.c:138
-#, fuzzy
+#: src/arch/unix/gui/uipalemu.c:139
msgid "*Old Exact PAL Emulation"
-msgstr "*Exakte PAL Emulation"
+msgstr "*Exakte PAL Emulation (erste Version)"
-#: src/arch/unix/gui/uipalemu.c:140
-#, fuzzy
+#: src/arch/unix/gui/uipalemu.c:142
msgid "*New Exact PAL Emulation"
msgstr "*Exakte PAL Emulation"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "PAL Scanline Schatten"
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
#: src/arch/unix/gui/uipalette.c:47
msgid "Load custom palette"
@@ -5424,59 +5414,58 @@
msgid "Can't create image `%s'."
msgstr "Kann Image `%s' nicht erzeugen."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr "Unsch\xE4rfe"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
msgid "Scanline Shade"
msgstr "Scanline Schatten"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "S\xE4ttigung"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Kontrast"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "Helligkeit"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
-#, fuzzy
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
msgid "Tint"
-msgstr "Client"
+msgstr "Farbton"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
-msgstr ""
+msgstr "Ungerade Zeilenphase"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
-msgstr ""
+msgstr "Ungerader Zeilenoffset"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "PAL Einstellungen"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Schnelle Emulation"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
+msgid "Fast"
+msgstr "Schnell"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Exakte Emulation"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Exakt"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
-#, fuzzy
-msgid "New Exact Emulation"
-msgstr "Exakte Emulation"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
+msgid "New Exact"
+msgstr "Exakt"
#: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
#: src/arch/amigaos/intl.c.po.c:4493
@@ -5763,9 +5752,8 @@
msgstr "Monitor"
#: src/arch/unix/x11/gnome/x11ui.c:1825
-#, fuzzy
msgid "Continue"
-msgstr "Verzeichnis"
+msgstr "Fortsetzen"
#: src/arch/unix/x11/gnome/x11ui.c:1871 src/arch/unix/x11/xaw/x11ui.c:1788
msgid "Extend disk image"
@@ -6374,9 +6362,8 @@
msgstr "Copyright (c) 2006-2008 Christian Vogelgsang"
#: src/arch/win32/res.rc.po.c:568
-#, fuzzy
msgid "Copyright (c) 2007-2008 Fabrizio Gennari"
-msgstr "Copyright (c) 2000-2004 Markus Brenner"
+msgstr "Copyright (c) 2007-2008 Fabrizio Gennari"
#: src/arch/win32/res.rc.po.c:569
msgid "Copyright (c) 1999-2007 Andreas Dehmel"
@@ -6682,11 +6669,11 @@
#: src/arch/win32/res.rc.po.c:2958
msgid "Odd lines phase"
-msgstr ""
+msgstr "Ungerade Zeilenphase"
#: src/arch/win32/res.rc.po.c:2961
msgid "Odd lines offset"
-msgstr ""
+msgstr "Ungerader Zeilenoffset"
#: src/arch/win32/res.rc.po.c:3096
msgid "Phase"
@@ -7207,9 +7194,8 @@
msgstr "Farben"
#: src/arch/win32/res.rc.po.c:5131
-#, fuzzy
msgid "New PAL emulation"
-msgstr "*PAL Emulation"
+msgstr "PAL Emulation"
#: src/arch/win32/res.rc.po.c:5132 src/arch/amigaos/intl.c.po.c:4367
msgid "Video settings"
@@ -7245,14 +7231,12 @@
msgstr "Action Replay III Erweiterungsmodul Image einlegen"
#: src/arch/win32/res.rc.po.c:5143 src/arch/amigaos/intl.c.po.c:2432
-#, fuzzy
msgid "Attach Action Replay 4 cartridge image"
-msgstr "Action Replay Erweiterungsmodul Image einlegen"
+msgstr "Action Replay 4 Erweiterungsmodul Image einlegen"
#: src/arch/win32/res.rc.po.c:5144 src/arch/amigaos/intl.c.po.c:2441
-#, fuzzy
msgid "Attach StarDOS cartridge image"
-msgstr "Erweiterungsmodul Image einlegen"
+msgstr "Erweiterungsmodul StarDOS Image einlegen"
#: src/arch/win32/res.rc.po.c:5145 src/arch/amigaos/intl.c.po.c:2450
msgid "Attach Atomic Power cartridge image"
@@ -7445,10 +7429,6 @@
msgid "Adjusting"
msgstr "Anpassend"
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Exakt"
-
#: src/arch/win32/res.rc.po.c:5198
msgid "Sound driver: DirectX"
msgstr "Sound Treiber: DirectX"
@@ -7775,19 +7755,16 @@
msgstr "&Action Replay Image..."
#: src/arch/win32/resc128.rc.po.c:67
-#, fuzzy
msgid "&Action Replay 3 image..."
-msgstr "&Action Replay Image..."
+msgstr "&Action Replay 3 Image..."
#: src/arch/win32/resc128.rc.po.c:68
-#, fuzzy
msgid "&Action Replay 4 image..."
-msgstr "&Action Replay Image..."
+msgstr "&Action Replay 4 Image..."
#: src/arch/win32/resc128.rc.po.c:69
-#, fuzzy
msgid "&StarDOS image..."
-msgstr "&CRT Image..."
+msgstr "&StarDOS Image..."
#: src/arch/win32/resc128.rc.po.c:70 src/arch/win32/resc64.rc.po.c:70
msgid "Atomic &Power image..."
@@ -7965,23 +7942,20 @@
#: src/arch/win32/resc128.rc.po.c:123 src/arch/win32/resc64.rc.po.c:123
#: src/arch/win32/rescbm2.rc.po.c:92 src/arch/win32/respet.rc.po.c:90
#: src/arch/win32/resplus4.rc.po.c:102 src/arch/win32/resvic20.rc.po.c:100
-#, fuzzy
msgid "&Edit"
-msgstr "Editor"
+msgstr "B&earbeiten"
#: src/arch/win32/resc128.rc.po.c:125 src/arch/win32/resc64.rc.po.c:125
#: src/arch/win32/rescbm2.rc.po.c:94 src/arch/win32/respet.rc.po.c:92
#: src/arch/win32/resplus4.rc.po.c:104 src/arch/win32/resvic20.rc.po.c:102
-#, fuzzy
msgid "&Copy"
-msgstr "S&top"
+msgstr "&Kopieren"
#: src/arch/win32/resc128.rc.po.c:126 src/arch/win32/resc64.rc.po.c:126
#: src/arch/win32/rescbm2.rc.po.c:95 src/arch/win32/respet.rc.po.c:93
#: src/arch/win32/resplus4.rc.po.c:105 src/arch/win32/resvic20.rc.po.c:103
-#, fuzzy
msgid "&Paste"
-msgstr "Pause"
+msgstr "&Einf\xFCgen"
#: src/arch/win32/resc128.rc.po.c:128 src/arch/win32/resc64.rc.po.c:128
#: src/arch/win32/rescbm2.rc.po.c:97 src/arch/win32/respet.rc.po.c:95
@@ -8830,14 +8804,12 @@
msgstr "Action Replay &III Imagedatei..."
#: src/arch/win32/resc64.rc.po.c:68
-#, fuzzy
msgid "Action Replay &4 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay &4 Image..."
#: src/arch/win32/resc64.rc.po.c:69
-#, fuzzy
msgid "Star&DOS image..."
-msgstr "&CRT Image..."
+msgstr "Star&DOS Image..."
#: src/arch/win32/resc64.rc.po.c:153 src/arch/amigaos/intl.c.po.c:870
msgid "Netplay (experimental)..."
@@ -10151,19 +10123,16 @@
msgstr "Action Replay Image..."
#: src/arch/amigaos/intl.c.po.c:483
-#, fuzzy
msgid "Action Replay 3 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay 3 Image..."
#: src/arch/amigaos/intl.c.po.c:492
-#, fuzzy
msgid "Action Replay 4 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay 4 Image..."
#: src/arch/amigaos/intl.c.po.c:501
-#, fuzzy
msgid "StarDOS image..."
-msgstr "CRT Image..."
+msgstr "StarDOS Image..."
#: src/arch/amigaos/intl.c.po.c:510
msgid "Atomic Power image..."
@@ -10210,18 +10179,16 @@
msgstr "Exit"
#: src/arch/amigaos/intl.c.po.c:699
-#, fuzzy
msgid "Edit"
-msgstr "Editor"
+msgstr "Bearbeiten"
#: src/arch/amigaos/intl.c.po.c:708
msgid "Copy"
-msgstr ""
+msgstr "Kopie"
#: src/arch/amigaos/intl.c.po.c:717
-#, fuzzy
msgid "Paste"
-msgstr "Phase"
+msgstr "Einf\xFCgen"
#: src/arch/amigaos/intl.c.po.c:735
msgid "Load snapshot image..."
@@ -10726,9 +10693,8 @@
msgstr "Ja|Nein"
#: src/arch/amigaos/intl.c.po.c:2423
-#, fuzzy
msgid "Attach Action Replay 3 cartridge image"
-msgstr "Action Replay Erweiterungsmodul Image einlegen"
+msgstr "Action Replay 3 Erweiterungsmodul Image einlegen"
#: src/arch/amigaos/intl.c.po.c:2585
msgid "Attach"
@@ -11120,7 +11086,6 @@
msgstr "Schnelle PAL"
#: src/arch/amigaos/intl.c.po.c:4241
-#, fuzzy
msgid "New PAL Emulation"
msgstr "PAL Emulation"
@@ -11141,19 +11106,16 @@
msgstr "PAL Unsch\xE4rfe (0..1)"
#: src/arch/amigaos/intl.c.po.c:4286
-#, fuzzy
msgid "Tint (0..2)"
-msgstr "(0..2)"
+msgstr "Farbton (0..2)"
#: src/arch/amigaos/intl.c.po.c:4295
-#, fuzzy
msgid "Odd Lines Phase (0..2)"
-msgstr "Helligkeit (0..2)"
+msgstr "Ungerade Zeilenphase (0..2)"
#: src/arch/amigaos/intl.c.po.c:4304
-#, fuzzy
msgid "Odd Lines Offset (0..2)"
-msgstr "Helligkeit (0..2)"
+msgstr "Ungerader Zeilenoffset (0..2)"
#: src/arch/amigaos/intl.c.po.c:4322
msgid "External Palette"
Modified: branches/chris/cocoa-port/vice/po/fr.po
===================================================================
--- branches/chris/cocoa-port/vice/po/fr.po 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/po/fr.po 2008-07-26 08:45:19 UTC (rev 19081)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2007-07-26 11:57+0200\n"
"Last-Translator: Paul Dub\xE9 <dub...@gm...>\n"
"Language-Team: fr <fr...@li...>\n"
@@ -108,7 +108,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1043,26 +1043,26 @@
msgid "Size of the RAM expansion unit"
msgstr "Taille de l'unit\xE9 d'expansion RAM"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
#, fuzzy
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "Activer l'unit\xE9 TFE (\"The Final Ethernet\")"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
#, fuzzy
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "D\xE9sactiver l'unit\xE9 TFE"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr ""
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
#, fuzzy
msgid "Enable RRNet mode of TFE emulation"
msgstr "*Activer l'\xE9mulation r\xE9elle de lecteur"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
#, fuzzy
msgid "Disable RRNet mode of TFE emulation"
msgstr "D\xE9sactiver l'\xE9mulation de p\xE9riph\xE9rique RS232 userport"
@@ -3416,7 +3416,7 @@
msgstr "\xC0 propos de VICE..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "R\xE9initialiser"
@@ -4267,7 +4267,7 @@
msgid "Scanline Shade in percent"
msgstr "Opacit\xE9 de l'ombrage (%)"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
msgstr ""
@@ -4294,7 +4294,7 @@
msgid "Offset in percent"
msgstr "Quantit\xE9 de flou (%)"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr "Flou PAL"
@@ -4310,25 +4310,25 @@
msgid "*Fast PAL Emulation"
msgstr "*\xC9mulation PAL rapide"
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
#, fuzzy
msgid "*Old Exact PAL Emulation"
msgstr "*\xC9mulation exacte PAL"
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
#, fuzzy
msgid "*New Exact PAL Emulation"
msgstr "*\xC9mulation exacte PAL"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "Ombrage des scanlines PAL"
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
msgstr ""
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
msgstr ""
@@ -5595,59 +5595,61 @@
msgid "Can't create image `%s'."
msgstr "Impossible de cr\xE9er l'image `%s'."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr "Quantit\xE9 de flou"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
msgid "Scanline Shade"
msgstr "Ombrage des scanlines"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "Saturation"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Contraste"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "Luminosit\xE9"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Intensit\xE9"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
#, fuzzy
msgid "Tint"
msgstr "&Imprimer"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "Param\xE8tres PAL"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "\xC9mulation rapide"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
+#, fuzzy
+msgid "Fast"
+msgstr "*Rapide"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "\xC9mulation exacte"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Exact"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
#, fuzzy
-msgid "New Exact Emulation"
-msgstr "\xC9mulation exacte"
+msgid "New Exact"
+msgstr "Exact"
#: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
#: src/arch/amigaos/intl.c.po.c:4493
@@ -7660,10 +7662,6 @@
msgid "Adjusting"
msgstr "Ajust\xE9"
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Exact"
-
#: src/arch/win32/res.rc.po.c:5198
#, fuzzy
msgid "Sound driver: DirectX"
Modified: branches/chris/cocoa-port/vice/po/hu.po
===================================================================
--- branches/chris/cocoa-port/vice/po/hu.po 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/po/hu.po 2008-07-26 08:45:19 UTC (rev 19081)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2007-07-27 15:58+0200\n"
"Last-Translator: Karai Csaba <cs...@fr...>\n"
"Language-Team: Hungarian <hu...@li...>\n"
@@ -105,7 +105,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1005,23 +1005,23 @@
msgid "Size of the RAM expansion unit"
msgstr "RAM Expansion Unit m\xE9rete"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "TFE (\"the final ethernet\") egys\xE9g enged\xE9lyez\xE9se"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "TFE (\"the final ethernet\") egys\xE9g tilt\xE1sa"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr "Rendszer ethernet eszk\xF6z be\xE1ll\xEDt\xE1sa TFE emul\xE1ci\xF3hoz"
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
msgid "Enable RRNet mode of TFE emulation"
msgstr "RRNet m\xF3d enged\xE9lyez\xE9se TFE emul\xE1ci\xF3hoz"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
msgid "Disable RRNet mode of TFE emulation"
msgstr "RRNet m\xF3d tilt\xE1sa TFE emul\xE1ci\xF3hoz"
@@ -3342,7 +3342,7 @@
msgstr "A VICE-r\xF3l..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "Reset"
@@ -4154,7 +4154,7 @@
msgid "Scanline Shade in percent"
msgstr "P\xE1szta \xE1rnyal\xE1s sz\xE1zal\xE9kban"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
msgstr ""
@@ -4181,7 +4181,7 @@
msgid "Offset in percent"
msgstr "Elmos\xE1s sz\xE1zal\xE9kban"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr "PAL elmos\xE1s"
@@ -4197,25 +4197,25 @@
msgid "*Fast PAL Emulation"
msgstr "*Gyors PAL emul\xE1ci\xF3"
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
#, fuzzy
msgid "*Old Exact PAL Emulation"
msgstr "*Pontos PAL emul\xE1ci\xF3"
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
#, fuzzy
msgid "*New Exact PAL Emulation"
msgstr "*Pontos PAL emul\xE1ci\xF3"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "PAL p\xE1szta \xE1rnyal\xE1s"
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
msgstr ""
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
msgstr ""
@@ -5462,59 +5462,61 @@
msgid "Can't create image `%s'."
msgstr "Nem siker\xFClt `%s' k\xE9pm\xE1st l\xE9trehozni."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr "Elmos\xE1s"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
msgid "Scanline Shade"
msgstr "P\xE1szta \xE1rnyal\xE1s"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "Tel\xEDtetts\xE9g"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Kontraszt"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "F\xE9nyess\xE9g"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
#, fuzzy
msgid "Tint"
msgstr "Kliens"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "PAL Be\xE1ll\xEDt\xE1sai"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Gyors emul\xE1ci\xF3"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
+#, fuzzy
+msgid "Fast"
+msgstr "*Gyors"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Pontos emul\xE1ci\xF3"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Pontos"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
#, fuzzy
-msgid "New Exact Emulation"
-msgstr "Pontos emul\xE1ci\xF3"
+msgid "New Exact"
+msgstr "Pontos"
#: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
#: src/arch/amigaos/intl.c.po.c:4493
@@ -7483,10 +7485,6 @@
msgid "Adjusting"
msgstr "Igazod\xF3"
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Pontos"
-
#: src/arch/win32/res.rc.po.c:5198
msgid "Sound driver: DirectX"
msgstr "Hang meghajt\xF3: DirectX"
Modified: branches/chris/cocoa-port/vice/po/it.po
===================================================================
--- branches/chris/cocoa-port/vice/po/it.po 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/po/it.po 2008-07-26 08:45:19 UTC (rev 19081)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2007-07-28 14:26+0100\n"
"Last-Translator: Andrea Musuruane <mus...@gm...>\n"
"Language-Team: it <it...@li...>\n"
@@ -104,7 +104,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1028,23 +1028,23 @@
msgid "Size of the RAM expansion unit"
msgstr "Dimensione dell'espansione di RAM"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "Attiva l'unit\xE0 TFE (\"The Final Ethernet\")"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "Disattiva l'unit\xE0 TFE (\"The Final Ethernet\")"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr "Imposta l'interfaccia ethernet per l'emulazione TFE"
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
msgid "Enable RRNet mode of TFE emulation"
msgstr "Attiva la modalit\xE0 RRNet dell'emulazione TFE"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
msgid "Disable RRNet mode of TFE emulation"
msgstr "Disattiva la modalit\xE0 RRNet dell'emulazione TFE"
@@ -3382,7 +3382,7 @@
msgstr "Informazioni su VICE..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "Reset"
@@ -4196,7 +4196,7 @@
msgid "Scanline Shade in percent"
msgstr "Ombra della scanline in percentuale"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
msgstr ""
@@ -4223,7 +4223,7 @@
msgid "Offset in percent"
msgstr "Sfuocatura in percentuale"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr "Sfuocatura PAL"
@@ -4239,25 +4239,25 @@
msgid "*Fast PAL Emulation"
msgstr "*Emulazione PAL veloce"
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
#, fuzzy
msgid "*Old Exact PAL Emulation"
msgstr "*Emulazione PAL esatta"
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
#, fuzzy
msgid "*New Exact PAL Emulation"
msgstr "*Emulazione PAL esatta"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "Ombra della scanline PAL"
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
msgstr ""
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
msgstr ""
@@ -5505,59 +5505,61 @@
msgid "Can't create image `%s'."
msgstr "Non \xE8 possibile creare l'immagine `%s'."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr "Sfuocatura"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
msgid "Scanline Shade"
msgstr "Ombra scanline"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "Saturazione"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Contrasto"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "Luminosit\xE0"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
#, fuzzy
msgid "Tint"
msgstr "Client"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "Impostazioni PAL"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Emulazione veloce"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
+#, fuzzy
+msgid "Fast"
+msgstr "*Veloce"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Emulazione esatta"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Esatta"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
#, fuzzy
-msgid "New Exact Emulation"
-msgstr "Emulazione esatta"
+msgid "New Exact"
+msgstr "Esatta"
#: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
#: src/arch/amigaos/intl.c.po.c:4493
@@ -7539,10 +7541,6 @@
msgid "Adjusting"
msgstr "Adattabile"
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Esatta"
-
#: src/arch/win32/res.rc.po.c:5198
msgid "Sound driver: DirectX"
msgstr "Driver audio: DirectX"
Modified: branches/chris/cocoa-port/vice/po/nl.po
===================================================================
--- branches/chris/cocoa-port/vice/po/nl.po 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/po/nl.po 2008-07-26 08:45:19 UTC (rev 19081)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2008-06-11 11:57+0200\n"
"Last-Translator: Marco van den Heuvel <bla...@ya...>\n"
"Language-Team: nl <nl...@li...>\n"
@@ -108,7 +108,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1003,23 +1003,23 @@
msgid "Size of the RAM expansion unit"
msgstr "Grootte van de RAM-uitbreidingseenheid (REU)"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "Activeer de TFE (\"The Final Ethernet\")-eenheid"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "De TFE (\"The Final Ethernet\")-eenheid uitschakelen"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr "Zet de systeem ethernetinterface voor de TFE-emulatie"
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
msgid "Enable RRNet mode of TFE emulation"
msgstr "Activeer RRNet-modus van de TFE-emulatie"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
msgid "Disable RRNet mode of TFE emulation"
msgstr "RRNet-modus van de TFE-emulatie uitschakelen"
@@ -3350,7 +3350,7 @@
msgstr "Over VICE..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "Reset"
@@ -4163,7 +4163,7 @@
msgid "Scanline Shade in percent"
msgstr "Scanlijnschaduw in procent"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
msgstr "Nieuwe PAL Tint"
@@ -4187,7 +4187,7 @@
msgid "Offset in percent"
msgstr "Compensatie in procent"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr "PAL-wazigheid"
@@ -4203,23 +4203,23 @@
msgid "*Fast PAL Emulation"
msgstr "*Snelle PAL-emulatie"
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
msgid "*Old Exact PAL Emulation"
msgstr "*Oude Exacte PAL-emulatie"
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
msgid "*New Exact PAL Emulation"
msgstr "*Nieuwe Exacte PAL-emulatie"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "PAL-scanlijnschaduw"
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
msgstr "Nieuwe PAL oneven lijnen fase"
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
msgstr "Nieuwe PAL oneven lijnen compensatie"
@@ -5465,57 +5465,58 @@
msgid "Can't create image `%s'."
msgstr "Kan bestand `%s' niet maken."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr "Wazigheid"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
msgid "Scanline Shade"
msgstr "Scanlijnschaduw"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "Verzadiging"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Contrast"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "Helderheid"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
msgid "Tint"
msgstr "Tint"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
msgstr "Oneven lijnen fase"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
msgstr "Oneven lijnen compensatie"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "PAL-instellingen"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Snelle emulatie"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
+msgid "Fast"
+msgstr "Snel"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Exacte emulatie"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Exact"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
-msgid "New Exact Emulation"
-msgstr "Nieuwe Exacte emulatie"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
+msgid "New Exact"
+msgstr "Nieuw Exact"
#: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
#: src/arch/amigaos/intl.c.po.c:4493
@@ -7487,10 +7488,6 @@
msgid "Adjusting"
msgstr "Aanpassend"
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Exact"
-
#: src/arch/win32/res.rc.po.c:5198
msgid "Sound driver: DirectX"
msgstr "Geluid stuurprogramma: DirectX"
Modified: branches/chris/cocoa-port/vice/po/pl.po
===================================================================
--- branches/chris/cocoa-port/vice/po/pl.po 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/po/pl.po 2008-07-26 08:45:19 UTC (rev 19081)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2007-07-26 11:55+0200\n"
"Last-Translator: Mariusz M\xB3ynek <fl...@go...>\n"
"Language-Team: pl <pl...@li...>\n"
@@ -108,7 +108,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1105,25 +1105,25 @@
msgid "Size of the RAM expansion unit"
msgstr "Jednostka rozszerzenia RAM"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr ""
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr ""
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr ""
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
#, fuzzy
msgid "Enable RRNet mode of TFE emulation"
msgstr "*W\xB3\xB1cz rzeczywist\xB1 emulacj\xEA nap\xEAdu"
# src/arch/unix/uisettings.c:614 src/arch/unix/vic20ui.c:317
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
#, fuzzy
msgid "Disable RRNet mode of TFE emulation"
msgstr "*Brak emulacji portu RS232"
@@ -3565,7 +3565,7 @@
msgstr "O VICE..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "Reset"
@@ -4436,7 +4436,7 @@
msgid "Scanline Shade in percent"
msgstr "Cieniowane scanline w procentach"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
msgstr ""
@@ -4464,7 +4464,7 @@
msgid "Offset in percent"
msgstr "Cieniowane scanline w procentach"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr ""
@@ -4482,25 +4482,25 @@
msgid "*Fast PAL Emulation"
msgstr "*Szybka emulacja PAL"
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
#, fuzzy
msgid "*Old Exact PAL Emulation"
msgstr "*Udawana emulacja PAL"
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
#, fuzzy
msgid "*New Exact PAL Emulation"
msgstr "*Udawana emulacja PAL"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "Cieniowane scanline PAL "
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
msgstr ""
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
msgstr ""
@@ -5811,62 +5811,63 @@
msgid "Can't create image `%s'."
msgstr "Nie mo\xBFna stworzyc obrazu `%s'."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
#, fuzzy
msgid "Scanline Shade"
msgstr "Cieniowane scanline PAL "
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "Nasycenie"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Kontrast"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "Jaskrawo\xB6\xE6"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
#, fuzzy
msgid "Tint"
msgstr "Ustawienia drukarki"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "Ustawienia PAL"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
#, fuzzy
-msgid "Fast Emulation"
-msgstr "*Szybka emulacja PAL"
+msgid "Fast"
+msgstr "*Szybko"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
#, fuzzy
-msgid "Exact Emulation"
-msgstr "Emulacja PAL"
+msgid "Exact"
+msgstr "*Wymu\xB6"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
#, fuzzy
-msgid "New Exact Emulation"
-msgstr "Emulacja PAL"
+msgid "New Exact"
+msgstr "*Wymu\xB6"
#: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
#: src/arch/amigaos/intl.c.po.c:4493
@@ -8073,11 +8074,6 @@
msgid "Adjusting"
msgstr "*Dodawanie"
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-#, fuzzy
-msgid "Exact"
-msgstr "*Wymu\xB6"
-
#: src/arch/win32/res.rc.po.c:5198
msgid "Sound driver: DirectX"
msgstr ""
Modified: branches/chris/cocoa-port/vice/po/sv.po
===================================================================
--- branches/chris/cocoa-port/vice/po/sv.po 2008-07-24 20:57:39 UTC (rev 19080)
+++ branches/chris/cocoa-port/vice/po/sv.po 2008-07-26 08:45:19 UTC (rev 19081)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2007-07-30 20:49+0100\n"
"Last-Translator: Peter Karlsson <pe...@so...>\n"
"Language-Team: Swedish <tp...@li...>\n"
@@ -105,7 +105,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -998,23 +998,23 @@
msgid "Size of the RAM expansion unit"
msgstr "Storlek p\xE5 RAM-expansionsenhet"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "Aktivera TFE-enhet (\"The Final Ethernet\")"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "Inaktivera TFE-enhet (\"The Final Ethernet\")"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr "St\xE4ll in systemets ethernetgr\xE4nssnitt f\xF6r TFE-emulering"
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
msgid "Enable RRNet mode of TFE emulation"
msgstr "Aktivera RRNet-l\xE4ge p\xE5 TFE-emulering"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate...
[truncated message content] |
|
From: <bla...@us...> - 2008-07-24 20:57:30
|
Revision: 19080
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19080&view=rev
Author: blackystardust
Date: 2008-07-24 20:57:39 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
Fixed the watcom warnings.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c 2008-07-24 20:41:25 UTC (rev 19079)
+++ branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c 2008-07-24 20:57:39 UTC (rev 19080)
@@ -331,15 +331,15 @@
|| SMR_DW_INT(m, &vicii.countb) < 0
|| SMR_DW_INT(m, &vicii.countb_mod) < 0
|| SMR_DW_INT(m, &vicii.countb_step) < 0
- || SMR_DW(m, &vicii.extended_enable) < 0
- || SMR_DW(m, &vicii.extended_lockout) < 0
- || SMR_DW(m, &vicii.badline_disable) < 0
- || SMR_DW(m, &vicii.colorfetch_disable) < 0
- || SMR_DW(m, &vicii.overscan) < 0
- || SMR_DW(m, &vicii.high_color) < 0
- || SMR_DW(m, &vicii.border_off) < 0
- || SMR_DW(m, &vicii.raster_irq_offset) < 0
- || SMR_DW(m, &vicii.raster_irq_prevent) < 0
+ || SMR_DW_INT(m, (int *)&vicii.extended_enable) < 0
+ || SMR_DW_INT(m, (int *)&vicii.extended_lockout) < 0
+ || SMR_DW_INT(m, (int *)&vicii.badline_disable) < 0
+ || SMR_DW_INT(m, (int *)&vicii.colorfetch_disable) < 0
+ || SMR_DW_INT(m, (int *)&vicii.overscan) < 0
+ || SMR_DW_INT(m, (int *)&vicii.high_color) < 0
+ || SMR_DW_INT(m, (int *)&vicii.border_off) < 0
+ || SMR_DW_INT(m, &vicii.raster_irq_offset) < 0
+ || SMR_DW_INT(m, &vicii.raster_irq_prevent) < 0
|| SMR_BA(m, vicii.dtvpalette, 256) < 0
/* SbCollMask */
|| SMR_B(m, &vicii.sprite_background_collisions) < 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-24 20:41:19
|
Revision: 19079
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19079&view=rev
Author: blackystardust
Date: 2008-07-24 20:41:25 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
Fixed the msvc warnings.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/flash-trap.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c 2008-07-24 14:45:22 UTC (rev 19078)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c 2008-07-24 20:41:25 UTC (rev 19079)
@@ -133,10 +133,10 @@
(((DWORD) mrtf(paddr + 2)) << 8) +
(((DWORD) mrtf(paddr + 3)) << 0);
#else
- return (((DWORD) mrtf(paddr + 3)) << 24) +
- (((DWORD) mrtf(paddr + 2)) << 16) +
- (((DWORD) mrtf(paddr + 1)) << 8) +
- (((DWORD) mrtf(paddr + 0)) << 0);
+ return (((DWORD) mrtf((WORD)(paddr + 3))) << 24) +
+ (((DWORD) mrtf((WORD)(paddr + 2))) << 16) +
+ (((DWORD) mrtf((WORD)(paddr + 1))) << 8) +
+ (((DWORD) mrtf((WORD)(paddr + 0))) << 0);
#endif
}
}
@@ -256,10 +256,10 @@
/* Route zero page operations through register 10 (zeropage mapper) */
#define STORE_ZERO(addr, value) \
- mem_store((WORD)((((WORD) dtv_registers[10]) << 8) + ((addr) & 0xff)), (BYTE)(value))
+ mem_store((WORD)((((WORD) dtv_registers[10]) << 8) + ((WORD)(addr) & 0xff)), (BYTE)(value))
#define LOAD_ZERO(addr) \
- mem_read((WORD)(((WORD) dtv_registers[10]) << 8) + ((WORD)((addr) & 0xff)))
+ mem_read((WORD)((((WORD) dtv_registers[10]) << 8) + ((WORD)((addr) & 0xff))))
/* Route stack operations through register 11 (stack mapper) */
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/flash-trap.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/flash-trap.c 2008-07-24 14:45:22 UTC (rev 19078)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/flash-trap.c 2008-07-24 20:41:25 UTC (rev 19079)
@@ -30,6 +30,8 @@
#include "vice.h"
+#define C64DTV
+
#include <stdio.h>
#include <string.h>
@@ -41,7 +43,6 @@
#include "log.h"
#include "maincpu.h"
#include "mem.h"
-#include "mos6510.h"
#include "mos6510dtv.h"
#include "traps.h"
#include "types.h"
@@ -129,7 +130,7 @@
name_len = mem_read(0xB7);
fname = mem_read(0xBB) | (mem_read(0xBC) << 8);
for (i=0; i<name_len; i++) {
- name[i] = mem_read(fname + i);
+ name[i] = mem_read((WORD)(fname + i));
}
name[i]=0x00;
}
@@ -193,9 +194,9 @@
direntry[0x1A] = 0x02;
/* load_address */
- direntry[0x1B] = load_addr & 0xff;
- direntry[0x1C] = (load_addr >> 8) & 0xff;
- direntry[0x1D] = (load_addr >> 16) & 0xff;
+ direntry[0x1B] = (BYTE)(load_addr & 0xff);
+ direntry[0x1C] = (BYTE)((load_addr >> 8) & 0xff);
+ direntry[0x1D] = (BYTE)((load_addr >> 16) & 0xff);
/* sys_address (non-standard) */
direntry[0x1E] = 0x00;
@@ -218,7 +219,7 @@
/* write out directory entry to the buffer at $0100-$011F */
for (i=0; i < sizeof(direntry); i++)
- mem_store(0x0100 + i, direntry[i]);
+ mem_store((WORD)(0x0100 + i), direntry[i]);
return 1;
}
@@ -248,14 +249,14 @@
}
/* set exit values for success and return */
- laddr = addr & 0xff;
- maddr = (addr >> 8) & 0xff;
- haddr = (addr >> 16) & 0xff;
+ laddr = (BYTE)(addr & 0xff);
+ maddr = (BYTE)((addr >> 8) & 0xff);
+ haddr = (BYTE)((addr >> 16) & 0xff);
mem_store((WORD)0xFB, laddr);
mem_store((WORD)0xFC, maddr);
mem_store((WORD)0xFD, haddr);
- MOS6510_REGS_SET_X(&maincpu_regs, laddr);
- MOS6510_REGS_SET_Y(&maincpu_regs, maddr);
+ MOS6510DTV_REGS_SET_X(&maincpu_regs, laddr);
+ MOS6510DTV_REGS_SET_Y(&maincpu_regs, maddr);
mem_store((WORD)0xAE, laddr);
mem_store((WORD)0xAF, maddr);
Modified: branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c 2008-07-24 14:45:22 UTC (rev 19078)
+++ branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c 2008-07-24 20:41:25 UTC (rev 19079)
@@ -517,7 +517,7 @@
vicii_update_video_mode(VICII_RASTER_CYCLE(maincpu_clk));
- vicii_store(0x3c, vicii.regs[0x3c]);
+ vicii_store(0x3c, (BYTE)vicii.regs[0x3c]);
vicii.draw_clk = maincpu_clk + (vicii.draw_cycle
- VICII_RASTER_CYCLE(maincpu_clk));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2008-07-24 14:45:13
|
Revision: 19078
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19078&view=rev
Author: nojoopa
Date: 2008-07-24 14:45:22 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
Code cleanup via readded VICII(DTV)_RASTER_X_ADJ.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciitypes.h
Modified: branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c 2008-07-24 06:22:44 UTC (rev 19077)
+++ branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c 2008-07-24 14:45:22 UTC (rev 19078)
@@ -749,7 +749,7 @@
vicii.regs[0x20] = value;
raster_changes_border_add_int(&vicii.raster,
- vicii.viciidtv?VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk))-2:VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk)),
+ vicii.viciidtv?VICIIDTV_RASTER_X_ADJ(VICII_RASTER_CYCLE(maincpu_clk)):VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk)),
(int *)&vicii.raster.border_color,
vicii.viciidtv?vicii.dtvpalette[value]:value);
}
@@ -768,7 +768,7 @@
if (!vicii.viciidtv && (vicii.regs[0x21] == value))
return;
- x_pos = vicii.viciidtv?VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk))-2:VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk));
+ x_pos = vicii.viciidtv?VICIIDTV_RASTER_X_ADJ(VICII_RASTER_CYCLE(maincpu_clk)):VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk));
if (!vicii.force_black_overscan_background_color) {
raster_changes_background_add_int(&vicii.raster, x_pos,
@@ -997,7 +997,7 @@
/* make some of those constants below into defines */
raster_changes_border_add_int(&vicii.raster,
- VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk))-2,
+ VICIIDTV_RASTER_X_ADJ(cycle),
(int *)&vicii.raster.border_disable,
vicii.border_off);
Modified: branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciitypes.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciitypes.h 2008-07-24 06:22:44 UTC (rev 19077)
+++ branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciitypes.h 2008-07-24 14:45:22 UTC (rev 19078)
@@ -123,6 +123,10 @@
SCREEN_WIDTH if outside the visible range. */
#define VICII_RASTER_X(cycle) (((int)(cycle) - 17) * 8 + vicii.screen_leftborderwidth)
+/* Adjusted RASTER_X position to account for -2 pixel difference on some
+ C64DTV stores */
+#define VICIIDTV_RASTER_X_ADJ(cycle) (VICII_RASTER_X(cycle) - 2)
+
/* Current vertical position of the raster. Unlike `rasterline', which is
only accurate if a pending drawing event has been served, this is
guarranteed to be always correct. It is a bit slow, though. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-24 06:22:37
|
Revision: 19077
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19077&view=rev
Author: blackystardust
Date: 2008-07-24 06:22:44 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
Updated and restructured the watcom project files for x64dtv and did some small fixes.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/arch.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/make-watcom-bindist.bat
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/monitor.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/vice.wpj
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/vicii.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/x128.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/x64.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/xcbm2.tgt
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc128.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc128c64dtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc64dtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64dtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/viciicommon.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/viciidtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/x64dtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/x64dtvmain.c
Removed Paths:
-------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64-snapshot.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64acia1.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64bus.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64cia2.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64datasette.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64export.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64iec.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64io.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64keyboard.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64meminit.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64memrom.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64parallel.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64pla.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64printer.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64rsuser.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64sound.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64tpi.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-digimax.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-georam.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-mmc64.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-patchrom.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-ramcart.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-reu.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-tfe.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64c128.tgt
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/arch.tgt
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/arch.tgt 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/arch.tgt 2008-07-24 06:22:44 UTC (rev 19077)
@@ -18,9 +18,10 @@
1
4
MCommand
-1111
+1224
copy /b ..\resc128.rc + ..\res.rc + ..\resacia.rc + ..\reside64.rc + ..\resreu.rc + ..\resgeoram.rc + ..\resramcart.rc + ..\resmmc64.rc + ..\resrs232user.rc + ..\ressid.rc + ..\resvicii.rc + ..\resdrivec128.rc + ..\resdigimax.rc + ..\resmouse.rc + ..\restfe.rc ..\resc128cat.rc /b
copy /b ..\resc64.rc + ..\res.rc + ..\resacia.rc + ..\resdrivec64.rc + ..\reside64.rc + ..\resreu.rc + ..\resgeoram.rc + ..\resramcart.rc + ..\resplus256k.rc + ..\resplus60k.rc + ..\resc64_256k.rc + ..\resmmc64.rc + ..\resrs232user.rc + ..\ressid.rc + ..\resvicii.rc + ..\resdigimax.rc + ..\resmouse.rc + ..\restfe.rc ..\resc64cat.rc /b
+copy /b ..\resc64dtv.rc + ..\res.rc + ..\resdrivec64.rc + ..\ressid.rc + ..\resvicii.rc ..\resc64dtvcat.rc /b
copy /b ..\rescbm2.rc + ..\res.rc + ..\resacia.rc + ..\resdrivepetcbm2.rc + ..\ressid.rc + ..\resvicii.rc ..\rescbm2cat.rc /b
copy /b ..\respet.rc + ..\res.rc + ..\resacia.rc + ..\resdrivepetcbm2.rc + ..\respetreu.rc + ..\ressidcart.rc ..\respetcat.rc /b
copy /b ..\resplus4.rc + ..\res.rc + ..\resacia.rc + ..\resdriveplus4.rc + ..\ressidcart.rc ..\resplus4cat.rc /b
@@ -49,7 +50,7 @@
0
10
WPickList
-85
+87
11
MItem
3
@@ -74,8 +75,8 @@
1
17
WString
-168
-$(%watcom)\h;$(%watcom)\h\nt;.;..;..\..\..;..\..\..\lib\libffmpeg;..\..\..\sid;..\..\..\drive;..\..\..\cbm2;..\..\..\vdrive;..\..\..\monitor;..\..\..\pet;..\..\..\plus4
+184
+$(%watcom)\h;$(%watcom)\h\nt;.;..;..\..\..;..\..\..\lib\libffmpeg;..\..\..\sid;..\..\..\drive;..\..\..\cbm2;..\..\..\vdrive;..\..\..\monitor;..\..\..\pet;..\..\..\plus4;..\..\..\c64dtv
0
18
WVList
@@ -140,8 +141,8 @@
0
31
MItem
-10
-..\c64ui.c
+13
+..\c64dtvui.c
32
WString
4
@@ -158,8 +159,8 @@
0
35
MItem
-19
-..\catweaselmkiii.c
+10
+..\c64ui.c
36
WString
4
@@ -176,8 +177,8 @@
0
39
MItem
-11
-..\cbm2ui.c
+19
+..\catweaselmkiii.c
40
WString
4
@@ -194,8 +195,8 @@
0
43
MItem
-12
-..\console.c
+11
+..\cbm2ui.c
44
WString
4
@@ -212,8 +213,8 @@
0
47
MItem
-11
-..\dirent.c
+12
+..\console.c
48
WString
4
@@ -230,8 +231,8 @@
0
51
MItem
-14
-..\ffmpeglib.c
+11
+..\dirent.c
52
WString
4
@@ -248,8 +249,8 @@
0
55
MItem
-13
-..\fullscrn.c
+14
+..\ffmpeglib.c
56
WString
4
@@ -266,8 +267,8 @@
0
59
MItem
-11
-..\gifdrv.c
+13
+..\fullscrn.c
60
WString
4
@@ -284,8 +285,8 @@
0
63
MItem
-12
-..\hardsid.c
+11
+..\gifdrv.c
64
WString
4
@@ -302,8 +303,8 @@
0
67
MItem
-9
-..\intl.c
+12
+..\hardsid.c
68
WString
4
@@ -320,8 +321,8 @@
0
71
MItem
-8
-..\joy.c
+9
+..\intl.c
72
WString
4
@@ -339,7 +340,7 @@
75
MItem
8
-..\kbd.c
+..\joy.c
76
WString
4
@@ -356,8 +357,8 @@
0
79
MItem
-13
-..\mousedrv.c
+8
+..\kbd.c
80
WString
4
@@ -374,8 +375,8 @@
0
83
MItem
-15
-..\opencbmlib.c
+13
+..\mousedrv.c
84
WString
4
@@ -392,8 +393,8 @@
0
87
MItem
-11
-..\parsid.c
+15
+..\opencbmlib.c
88
WString
4
@@ -410,8 +411,8 @@
0
91
MItem
-10
-..\petui.c
+11
+..\parsid.c
92
WString
4
@@ -428,8 +429,8 @@
0
95
MItem
-12
-..\plus4ui.c
+10
+..\petui.c
96
WString
4
@@ -446,8 +447,8 @@
0
99
MItem
-10
-..\rs232.c
+12
+..\plus4ui.c
100
WString
4
@@ -464,8 +465,8 @@
0
103
MItem
-12
-..\signals.c
+10
+..\rs232.c
104
WString
4
@@ -482,8 +483,8 @@
0
107
MItem
-14
-..\statusbar.c
+12
+..\signals.c
108
WString
4
@@ -500,8 +501,8 @@
0
111
MItem
-11
-..\system.c
+14
+..\statusbar.c
112
WString
4
@@ -518,8 +519,8 @@
0
115
MItem
-12
-..\tfearch.c
+11
+..\system.c
116
WString
4
@@ -536,8 +537,8 @@
0
119
MItem
-17
-..\ui-resources.c
+12
+..\tfearch.c
120
WString
4
@@ -554,8 +555,8 @@
0
123
MItem
-7
-..\ui.c
+17
+..\ui-resources.c
124
WString
4
@@ -572,8 +573,8 @@
0
127
MItem
-11
-..\uiacia.c
+7
+..\ui.c
128
WString
4
@@ -590,8 +591,8 @@
0
131
MItem
-13
-..\uiattach.c
+11
+..\uiacia.c
132
WString
4
@@ -608,8 +609,8 @@
0
135
MItem
-11
-..\uic128.c
+13
+..\uiattach.c
136
WString
4
@@ -626,8 +627,8 @@
0
139
MItem
-15
-..\uic64_256k.c
+11
+..\uic128.c
140
WString
4
@@ -644,8 +645,8 @@
0
143
MItem
-14
-..\uic64cart.c
+15
+..\uic64_256k.c
144
WString
4
@@ -662,8 +663,8 @@
0
147
MItem
-11
-..\uicart.c
+14
+..\uic64cart.c
148
WString
4
@@ -680,8 +681,8 @@
0
151
MItem
-14
-..\uicbm2set.c
+13
+..\uic64dtv.c
152
WString
4
@@ -698,8 +699,8 @@
0
155
MItem
-14
-..\uicmdline.c
+11
+..\uicart.c
156
WString
4
@@ -717,7 +718,7 @@
159
MItem
14
-..\uiconsole.c
+..\uicbm2set.c
160
WString
4
@@ -734,8 +735,8 @@
0
163
MItem
-16
-..\uidatasette.c
+14
+..\uicmdline.c
164
WString
4
@@ -753,7 +754,7 @@
167
MItem
14
-..\uidigimax.c
+..\uiconsole.c
168
WString
4
@@ -771,7 +772,7 @@
171
MItem
16
-..\uidrivec128.c
+..\uidatasette.c
172
WString
4
@@ -788,8 +789,8 @@
0
175
MItem
-15
-..\uidrivec64.c
+14
+..\uidigimax.c
176
WString
4
@@ -806,8 +807,8 @@
0
179
MItem
-19
-..\uidrivepetcbm2.c
+16
+..\uidrivec128.c
180
WString
4
@@ -824,8 +825,8 @@
0
183
MItem
-17
-..\uidriveplus4.c
+15
+..\uidrivec64.c
184
WString
4
@@ -842,8 +843,8 @@
0
187
MItem
-17
-..\uidrivevic20.c
+19
+..\uidrivepetcbm2.c
188
WString
4
@@ -860,8 +861,8 @@
0
191
MItem
-12
-..\uievent.c
+17
+..\uidriveplus4.c
192
WString
4
@@ -878,8 +879,8 @@
0
195
MItem
-15
-..\uifliplist.c
+17
+..\uidrivevic20.c
196
WString
4
@@ -896,8 +897,8 @@
0
199
MItem
-13
-..\uigeoram.c
+12
+..\uievent.c
200
WString
4
@@ -914,8 +915,8 @@
0
203
MItem
-11
-..\uihelp.c
+15
+..\uifliplist.c
204
WString
4
@@ -932,8 +933,8 @@
0
207
MItem
-12
-..\uiide64.c
+13
+..\uigeoram.c
208
WString
4
@@ -950,8 +951,8 @@
0
211
MItem
-15
-..\uijoystick.c
+11
+..\uihelp.c
212
WString
4
@@ -968,8 +969,8 @@
0
215
MItem
-15
-..\uikeyboard.c
+12
+..\uiide64.c
216
WString
4
@@ -986,8 +987,8 @@
0
219
MItem
-10
-..\uilib.c
+15
+..\uijoystick.c
220
WString
4
@@ -1004,8 +1005,8 @@
0
223
MItem
-16
-..\uimediafile.c
+15
+..\uikeyboard.c
224
WString
4
@@ -1022,8 +1023,8 @@
0
227
MItem
-12
-..\uimmc64.c
+10
+..\uilib.c
228
WString
4
@@ -1040,8 +1041,8 @@
0
231
MItem
-10
-..\uimon.c
+16
+..\uimediafile.c
232
WString
4
@@ -1059,7 +1060,7 @@
235
MItem
12
-..\uimouse.c
+..\uimmc64.c
236
WString
4
@@ -1076,8 +1077,8 @@
0
239
MItem
-14
-..\uinetwork.c
+10
+..\uimon.c
240
WString
4
@@ -1094,8 +1095,8 @@
0
243
MItem
-17
-..\uiperipheral.c
+12
+..\uimouse.c
244
WString
4
@@ -1112,8 +1113,8 @@
0
247
MItem
-13
-..\uipetreu.c
+14
+..\uinetwork.c
248
WString
4
@@ -1130,8 +1131,8 @@
0
251
MItem
-13
-..\uipetset.c
+17
+..\uiperipheral.c
252
WString
4
@@ -1148,8 +1149,8 @@
0
255
MItem
-15
-..\uiplus256k.c
+13
+..\uipetreu.c
256
WString
4
@@ -1166,8 +1167,8 @@
0
259
MItem
-16
-..\uiplus4cart.c
+13
+..\uipetset.c
260
WString
4
@@ -1185,7 +1186,7 @@
263
MItem
15
-..\uiplus4mem.c
+..\uiplus256k.c
264
WString
4
@@ -1202,8 +1203,8 @@
0
267
MItem
-14
-..\uiplus60k.c
+16
+..\uiplus4cart.c
268
WString
4
@@ -1220,8 +1221,8 @@
0
271
MItem
-20
-..\uiquicksnapshot.c
+15
+..\uiplus4mem.c
272
WString
4
@@ -1238,8 +1239,8 @@
0
275
MItem
-10
-..\uiram.c
+14
+..\uiplus60k.c
276
WString
4
@@ -1256,8 +1257,8 @@
0
279
MItem
-14
-..\uiramcart.c
+20
+..\uiquicksnapshot.c
280
WString
4
@@ -1275,7 +1276,7 @@
283
MItem
10
-..\uireu.c
+..\uiram.c
284
WString
4
@@ -1292,8 +1293,8 @@
0
287
MItem
-10
-..\uirom.c
+14
+..\uiramcart.c
288
WString
4
@@ -1310,8 +1311,8 @@
0
291
MItem
-12
-..\uirs232.c
+10
+..\uireu.c
292
WString
4
@@ -1328,8 +1329,8 @@
0
295
MItem
-16
-..\uirs232user.c
+10
+..\uirom.c
296
WString
4
@@ -1346,8 +1347,8 @@
0
299
MItem
-10
-..\uisid.c
+12
+..\uirs232.c
300
WString
4
@@ -1364,8 +1365,8 @@
0
303
MItem
-14
-..\uisidcart.c
+16
+..\uirs232user.c
304
WString
4
@@ -1382,8 +1383,8 @@
0
307
MItem
-15
-..\uisnapshot.c
+10
+..\uisid.c
308
WString
4
@@ -1400,8 +1401,8 @@
0
311
MItem
-12
-..\uisound.c
+14
+..\uisidcart.c
312
WString
4
@@ -1418,8 +1419,8 @@
0
315
MItem
-12
-..\uispeed.c
+15
+..\uisnapshot.c
316
WString
4
@@ -1436,8 +1437,8 @@
0
319
MItem
-10
-..\uitfe.c
+12
+..\uisound.c
320
WString
4
@@ -1455,7 +1456,7 @@
323
MItem
12
-..\uivicii.c
+..\uispeed.c
324
WString
4
@@ -1472,8 +1473,8 @@
0
327
MItem
-13
-..\uivicset.c
+10
+..\uitfe.c
328
WString
4
@@ -1491,7 +1492,7 @@
331
MItem
12
-..\uivideo.c
+..\uivicii.c
332
WString
4
@@ -1508,8 +1509,8 @@
0
335
MItem
-12
-..\vic20ui.c
+13
+..\uivicset.c
336
WString
4
@@ -1526,8 +1527,8 @@
0
339
MItem
-10
-..\video.c
+12
+..\uivideo.c
340
WString
4
@@ -1544,8 +1545,8 @@
0
343
MItem
-11
-..\vsidui.c
+12
+..\vic20ui.c
344
WString
4
@@ -1562,8 +1563,8 @@
0
347
MItem
-14
-..\vsyncarch.c
+10
+..\video.c
348
WString
4
@@ -1580,8 +1581,8 @@
0
351
MItem
-12
-..\winmain.c
+11
+..\vsidui.c
352
WString
4
@@ -1596,3 +1597,39 @@
1
1
0
+355
+MItem
+14
+..\vsyncarch.c
+356
+WString
+4
+COBJ
+357
+WVList
+0
+358
+WVList
+0
+11
+1
+1
+0
+359
+MItem
+12
+..\winmain.c
+360
+WString
+4
+COBJ
+361
+WVList
+0
+362
+WVList
+0
+11
+1
+1
+0
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64-snapshot.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64-snapshot.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64-snapshot.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64-snapshot.c - Watcom c64-snapshot.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64-snapshot.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64acia1.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64acia1.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64acia1.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64acia1.c - Watcom c64acia1.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64acia1.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64bus.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64bus.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64bus.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64bus.c - Watcom c64bus.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64bus.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64cia2.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64cia2.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64cia2.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64cia2.c - Watcom c64cia2.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64cia2.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64datasette.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64datasette.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64datasette.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64datasette.c - Watcom c64datasette.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64datasette.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64export.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64export.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64export.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64export.c - Watcom c64export.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64export.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64iec.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64iec.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64iec.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64iec.c - Watcom c64iec.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64iec.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64io.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64io.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64io.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64io.c - Watcom c64io.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64io.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64keyboard.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64keyboard.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64keyboard.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64keyboard.c - Watcom c64keyboard.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64keyboard.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64meminit.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64meminit.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64meminit.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64meminit.c - Watcom c64meminit.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64meminit.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64memrom.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64memrom.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64memrom.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64memrom.c - Watcom c64memrom.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64memrom.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64parallel.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64parallel.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64parallel.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64parallel.c - Watcom c64parallel.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64parallel.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64pla.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64pla.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64pla.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64pla.c - Watcom c64pla.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64pla.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64printer.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64printer.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64printer.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64printer.c - Watcom c64printer.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64printer.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64rsuser.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64rsuser.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64rsuser.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64rsuser.c - Watcom c64rsuser.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64rsuser.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64sound.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64sound.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64sound.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64sound.c - Watcom c64sound.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64sound.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64tpi.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64tpi.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-c64tpi.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-c64tpi.c - Watcom c64tpi.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64tpi.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-digimax.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-digimax.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-digimax.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-digimax.c - Watcom digimax.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "digimax.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-georam.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-georam.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-georam.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-georam.c - Watcom georam.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "georam.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-mmc64.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-mmc64.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-mmc64.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-mmc64.c - Watcom mmc64.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "mmc64.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-patchrom.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-patchrom.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-patchrom.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-patchrom.c - Watcom patchrom.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "patchrom.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-ramcart.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-ramcart.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-ramcart.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-ramcart.c - Watcom ramcart.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "ramcart.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-reu.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-reu.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-reu.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-reu.c - Watcom reu.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "reu.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-tfe.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-tfe.c 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c128-tfe.c 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,27 +0,0 @@
-/*
- * c128-tfe.c - Watcom tfe.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "tfe.c"
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64.tgt
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64.tgt 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64.tgt 2008-07-24 06:22:44 UTC (rev 19077)
@@ -42,7 +42,7 @@
0
10
WPickList
-42
+14
11
MItem
3
@@ -169,8 +169,8 @@
0
39
MItem
-23
-..\..\..\C64\c64acia1.c
+22
+..\..\..\C64\c64cia1.c
40
WString
4
@@ -188,7 +188,7 @@
43
MItem
21
-..\..\..\C64\c64bus.c
+..\..\..\C64\c64mem.c
44
WString
4
@@ -205,8 +205,8 @@
0
47
MItem
-22
-..\..\..\C64\c64cia1.c
+26
+..\..\..\C64\c64memlimit.c
48
WString
4
@@ -223,8 +223,8 @@
0
51
MItem
-22
-..\..\..\C64\c64cia2.c
+29
+..\..\..\C64\c64memsnapshot.c
52
WString
4
@@ -241,8 +241,8 @@
0
55
MItem
-27
-..\..\..\C64\c64datasette.c
+23
+..\..\..\C64\plus256k.c
56
WString
4
@@ -259,8 +259,8 @@
0
59
MItem
-23
-..\..\..\C64\c64drive.c
+22
+..\..\..\C64\plus60k.c
60
WString
4
@@ -277,8 +277,8 @@
0
63
MItem
-24
-..\..\..\C64\c64export.c
+19
+..\..\..\C64\psid.c
64
WString
4
@@ -295,8 +295,8 @@
0
67
MItem
-25
-..\..\..\C64\c64fastiec.c
+22
+..\..\..\C64\reloc65.c
68
WString
4
@@ -311,507 +311,3 @@
1
1
0
-71
-MItem
-21
-..\..\..\C64\c64iec.c
-72
-WString
-4
-COBJ
-73
-WVList
-0
-74
-WVList
-0
-11
-1
-1
-0
-75
-MItem
-20
-..\..\..\C64\c64io.c
-76
-WString
-4
-COBJ
-77
-WVList
-0
-78
-WVList
-0
-11
-1
-1
-0
-79
-MItem
-26
-..\..\..\C64\c64keyboard.c
-80
-WString
-4
-COBJ
-81
-WVList
-0
-82
-WVList
-0
-11
-1
-1
-0
-83
-MItem
-21
-..\..\..\C64\c64mem.c
-84
-WString
-4
-COBJ
-85
-WVList
-0
-86
-WVList
-0
-11
-1
-1
-0
-87
-MItem
-25
-..\..\..\C64\c64meminit.c
-88
-WString
-4
-COBJ
-89
-WVList
-0
-90
-WVList
-0
-11
-1
-1
-0
-91
-MItem
-26
-..\..\..\C64\c64memlimit.c
-92
-WString
-4
-COBJ
-93
-WVList
-0
-94
-WVList
-0
-11
-1
-1
-0
-95
-MItem
-24
-..\..\..\C64\c64memrom.c
-96
-WString
-4
-COBJ
-97
-WVList
-0
-98
-WVList
-0
-11
-1
-1
-0
-99
-MItem
-29
-..\..\..\C64\c64memsnapshot.c
-100
-WString
-4
-COBJ
-101
-WVList
-0
-102
-WVList
-0
-11
-1
-1
-0
-103
-MItem
-26
-..\..\..\C64\c64parallel.c
-104
-WString
-4
-COBJ
-105
-WVList
-0
-106
-WVList
-0
-11
-1
-1
-0
-107
-MItem
-21
-..\..\..\C64\c64pla.c
-108
-WString
-4
-COBJ
-109
-WVList
-0
-110
-WVList
-0
-11
-1
-1
-0
-111
-MItem
-25
-..\..\..\C64\c64printer.c
-112
-WString
-4
-COBJ
-113
-WVList
-0
-114
-WVList
-0
-11
-1
-1
-0
-115
-MItem
-21
-..\..\..\C64\c64rom.c
-116
-WString
-4
-COBJ
-117
-WVList
-0
-118
-WVList
-0
-11
-1
-1
-0
-119
-MItem
-24
-..\..\..\C64\c64romset.c
-120
-WString
-4
-COBJ
-121
-WVList
-0
-122
-WVList
-0
-11
-1
-1
-0
-123
-MItem
-24
-..\..\..\C64\c64rsuser.c
-124
-WString
-4
-COBJ
-125
-WVList
-0
-126
-WVList
-0
-11
-1
-1
-0
-127
-MItem
-23
-..\..\..\C64\c64sound.c
-128
-WString
-4
-COBJ
-129
-WVList
-0
-130
-WVList
-0
-11
-1
-1
-0
-131
-MItem
-21
-..\..\..\C64\c64tpi.c
-132
-WString
-4
-COBJ
-133
-WVList
-0
-134
-WVList
-0
-11
-1
-1
-0
-135
-MItem
-23
-..\..\..\C64\c64video.c
-136
-WString
-4
-COBJ
-137
-WVList
-0
-138
-WVList
-0
-11
-1
-1
-0
-139
-MItem
-22
-..\..\..\C64\digimax.c
-140
-WString
-4
-COBJ
-141
-WVList
-0
-142
-WVList
-0
-11
-1
-1
-0
-143
-MItem
-21
-..\..\..\C64\georam.c
-144
-WString
-4
-COBJ
-145
-WVList
-0
-146
-WVList
-0
-11
-1
-1
-0
-147
-MItem
-20
-..\..\..\C64\mmc64.c
-148
-WString
-4
-COBJ
-149
-WVList
-0
-150
-WVList
-0
-11
-1
-1
-0
-151
-MItem
-23
-..\..\..\C64\patchrom.c
-152
-WString
-4
-COBJ
-153
-WVList
-0
-154
-WVList
-0
-11
-1
-1
-0
-155
-MItem
-23
-..\..\..\C64\plus256k.c
-156
-WString
-4
-COBJ
-157
-WVList
-0
-158
-WVList
-0
-11
-1
-1
-0
-159
-MItem
-22
-..\..\..\C64\plus60k.c
-160
-WString
-4
-COBJ
-161
-WVList
-0
-162
-WVList
-0
-11
-1
-1
-0
-163
-MItem
-19
-..\..\..\C64\psid.c
-164
-WString
-4
-COBJ
-165
-WVList
-0
-166
-WVList
-0
-11
-1
-1
-0
-167
-MItem
-22
-..\..\..\C64\ramcart.c
-168
-WString
-4
-COBJ
-169
-WVList
-0
-170
-WVList
-0
-11
-1
-1
-0
-171
-MItem
-22
-..\..\..\C64\reloc65.c
-172
-WString
-4
-COBJ
-173
-WVList
-0
-174
-WVList
-0
-11
-1
-1
-0
-175
-MItem
-18
-..\..\..\C64\reu.c
-176
-WString
-4
-COBJ
-177
-WVList
-0
-178
-WVList
-0
-11
-1
-1
-0
-179
-MItem
-18
-..\..\..\C64\tfe.c
-180
-WString
-4
-COBJ
-181
-WVList
-0
-182
-WVList
-0
-11
-1
-1
-0
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64c128.tgt
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64c128.tgt 2008-07-23 17:18:20 UTC (rev 19076)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64c128.tgt 2008-07-24 06:22:44 UTC (rev 19077)
@@ -1,511 +0,0 @@
-40
-targetIdent
-0
-MProject
-1
-MComponent
-0
-2
-WString
-3
-LIB
-3
-WString
-5
-n_2sn
-1
-0
-1
-4
-MCommand
-0
-5
-MCommand
-0
-6
-MItem
-11
-c64c128.lib
-7
-WString
-3
-LIB
-8
-WVList
-0
-9
-WVList
-0
--1
-1
-1
-0
-10
-WPickList
-25
-11
-MItem
-3
-*.c
-12
-WString
-4
-COBJ
-13
-WVList
-1
-14
-MVState
-15
-WString
-3
-WCC
-16
-WString
-25
-n????Include directories:
-1
-17
-WString
-112
-$(%watcom)\h;$(%watcom)\h\nt;.;..;..\..\..;..\..\..\c64;..\..\..\drive;..\..\..\sid;..\..\..\tape;..\..\..\vicii
-0
-18
-WVList
-0
--1
-1
-1
-0
-19
-MItem
-19
-c128-c64-snapshot.c
-20
-WString
-4
-COBJ
-21
-WVList
-0
-22
-WVList
-0
-11
-1
-1
-0
-23
-MItem
-15
-c128-c64acia1.c
-24
-WString
-4
-COBJ
-25
-WVList
-0
-26
-WVList
-0
-11
-1
-1
-0
-27
-MItem
-13
-c128-c64bus.c
-28
-WString
-4
-COBJ
-29
-WVList
-0
-30
-WVList
-0
-11
-1
-1
-0
-31
-MItem
-14
-c128-c64cia2.c
-32
-WString
-4
-COBJ
-33
-WVList
-0
-34
-WVList
-0
-11
-1
-1
-0
-35
-MItem
-19
-c128-c64datasette.c
-36
-WString
-4
-COBJ
-37
-WVList
-0
-38
-WVList
-0
-11
-1
-1
-0
-39
-MItem
-16
-c128-c64export.c
-40
-WString
-4
-COBJ
-41
-WVList
-0
-42
-WVList
-0
-11
-1
-1
-0
-43
-MItem
-13
-c128-c64iec.c
-44
-WString
-4
-COBJ
-45
-WVList
-0
-46
-WVList
-0
-11
-1
-1
-0
-47
-MItem
-12
-c128-c64io.c
-48
-WString
-4
-COBJ
-49
-WVList
-0
-50
-WVList
-0
-11
-1
-1
-0
-51
-MItem
-18
-c128-c64keyboard.c
-52
-WString
-4
-COBJ
-53
-WVList
-0
-54
-WVList
-0
-11
-1
-1
-0
-55
-MItem
-17
-c128-c64meminit.c
-56
-WString
-4
-COBJ
-57
-WVList
-0
-58
-WVList
-0
-11
-1
-1
-0
-59
-MItem
-16
-c128-c64memrom.c
-60
-WString
-4
-COBJ
-61
-WVList
-0
-62
-WVList
-0
-11
-1
-1
-0
-63
-MItem
-18
-c128-c64parallel.c
-64
-WString
-4
-COBJ
-65
-WVList
-0
-66
-WVList
-0
-11
-1
-1
-0
-67
-MItem
-13
-c128-c64pla.c
-68
-WString
-4
-COBJ
-69
-WVList
-0
-70
-WVList
-0
-11
-1
-1
-0
-71
-MItem
-17
-c128-c64printer.c
-72
-WString
-4
-COBJ
-73
-WVList
-0
-74
-WVList
-0
-11
-1
-1
-0
-75
-MItem
-16
-c128-c64rsuser.c
-76
-WString
-4
-COBJ
-77
-WVList
-0
-78
-WVList
-0
-11
-1
-1
-0
-79
-MItem
-15
-c128-c64sound.c
-80
-WString
-4
-COBJ
-81
-WVList
-0
-82
-WVList
-0
-11
-1
-1
-0
-83
-MItem
-13
-c128-c64tpi.c
-84
-WString
-4
-COBJ
-85
-WVList
-0
-86
-WVList
-0
-11
-1
-1
-0
-87
-MItem
-14
-c128-digimax.c
-88
-WString
-4
-COBJ
-89
-WVList
-0
-90
-WVList
-0
-11
-1
-1
-0
-91
-MItem
-13
-c128-georam.c
-92
-WString
-4
-COBJ
-93
-WVList
-0
-94
-WVList
-0
-11
-1
-1
-0
-95
-MItem
-12
-c128-mmc64.c
-96
-WString
-4
-COBJ
-97
-WVList
-0
-98
-WVList
-0
-11
-1
-1
-0
-99
-MItem
-15
-c128-patchrom.c
-100
-WString
-4
-COBJ
-101
-WVList
-0
-102
-WVList
-0
-11
-1
-1
-0
-103
-MItem
-14
-c128-ramcart.c
-104
-WString
-4
-COBJ
-105
-WVList
-0
-106
-WVList
-0
-11
-1
-1
-0
-107
-MItem
-10
-c128-reu.c
-108
-WString
-4
-COBJ
-109
-WVList
-0
-110
-WVList
-0
-11
-1
-1
-0
-111
-MItem
-10
-c128-tfe.c
-112
-WString
-4
-COBJ
-113
-WVList
-0
-114
-WVList
-0
-11
-1
-1
-0
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc128.tgt
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc128.tgt (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc128.tgt 2008-07-24 06:22:44 UTC (rev 19077)
@@ -0,0 +1,385 @@
+40
+targetIdent
+0
+MProject
+1
+MComponent
+0
+2
+WString
+3
+LIB
+3
+WString
+5
+n_2sn
+1
+0
+1
+4
+MCommand
+0
+5
+MCommand
+0
+6
+MItem
+17
+c64commonc128.lib
+7
+WString
+3
+LIB
+8
+WVList
+0
+9
+WVList
+0
+-1
+1
+1
+0
+10
+WPickList
+18
+11
+MItem
+3
+*.c
+12
+WString
+4
+COBJ
+13
+WVList
+1
+14
+MVState
+15
+WString
+3
+WCC
+16
+WString
+25
+n????Include directories:
+1
+17
+WString
+99
+.;..;..\..\..;..\..\..\sid;..\..\..\vicii;..\..\..\drive;..\..\..\tape;$(%watcom)\h;$(%watcom)\h\nt
+0
+18
+WVList
+0
+-1
+1
+1
+0
+19
+MItem
+23
+..\..\..\C64\c64acia1.c
+20
+WString
+4
+COBJ
+21
+WVList
+0
+22
+WVList
+0
+11
+1
+1
+0
+23
+MItem
+22
+..\..\..\C64\c64cia2.c
+24
+WString
+4
+COBJ
+25
+WVList
+0
+26
+WVList
+0
+11
+1
+1
+0
+27
+MItem
+27
+..\..\..\C64\c64datasette.c
+28
+WString
+4
+COBJ
+29
+WVList
+0
+30
+WVList
+0
+11
+1
+1
+0
+31
+MItem
+24
+..\..\..\C64\c64export.c
+32
+WString
+4
+COBJ
+33
+WVList
+0
+34
+WVList
+0
+11
+1
+1
+0
+35
+MItem
+21
+..\..\..\C64\c64iec.c
+36
+WString
+4
+COBJ
+37
+WVList
+0
+38
+WVList
+0
+11
+1
+1
+0
+39
+MItem
+20
+..\..\..\C64\c64io.c
+40
+WString
+4
+COBJ
+41
+WVList
+0
+42
+WVList
+0
+11
+1
+1
+0
+43
+MItem
+25
+..\..\..\C64\c64meminit.c
+44
+WString
+4
+COBJ
+45
+WVList
+0
+46
+WVList
+0
+11
+1
+1
+0
+47
+MItem
+24
+..\..\..\C64\c64memrom.c
+48
+WString
+4
+COBJ
+49
+WVList
+0
+50
+WVList
+0
+11
+1
+1
+0
+51
+MItem
+21
+..\..\..\C64\c64pla.c
+52
+WString
+4
+COBJ
+53
+WVList
+0
+54
+WVList
+0
+11
+1
+1
+0
+55
+MItem
+23
+..\..\..\C64\c64sound.c
+56
+WString
+4
+COBJ
+57
+WVList
+0
+58
+WVList
+0
+11
+1
+1
+0
+59
+MItem
+21
+..\..\..\C64\c64tpi.c
+60
+WString
+4
+COBJ
+61
+WVList
+0
+62
+WVList
+0
+11
+1
+1
+0
+63
+MItem
+22
+..\..\..\C64\digimax.c
+64
+WString
+4
+COBJ
+65
+WVList
+0
+66
+WVList
+0
+11
+1
+1
+0
+67
+MItem
+21
+..\..\..\C64\georam.c
+68
+WString
+4
+COBJ
+69
+WVList
+0
+70
+WVList
+0
+11
+1
+1
+0
+71
+MItem
+20
+..\..\..\C64\mmc64.c
+72
+WString
+4
+COBJ
+73
+WVList
+0
+74
+WVList
+0
+11
+1
+1
+0
+75
+MItem
+22
+..\..\..\C64\ramcart.c
+76
+WString
+4
+COBJ
+77
+WVList
+0
+78
+WVList
+0
+11
+1
+1
+0
+79
+MItem
+18
+..\..\..\C64\reu.c
+80
+WString
+4
+COBJ
+81
+WVList
+0
+82
+WVList
+0
+11
+1
+1
+0
+83
+MItem
+18
+..\..\..\C64\tfe.c
+84
+WString
+4
+COBJ
+85
+WVList
+0
+86
+WVList
+0
+11
+1
+1
+0
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc128c64dtv.tgt
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc128c64dtv.tgt (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc128c64dtv.tgt 2008-07-24 06:22:44 UTC (rev 19077)
@@ -0,0 +1,187 @@
+40
+targetIdent
+0
+MProject
+1
+MComponent
+0
+2
+WString
+3
+LIB
+3
+WString
+5
+n_2sn
+1
+0
+1
+4
+MCommand
+0
+5
+MCommand
+0
+6
+MItem
+23
+c64commonc128c64dtv.lib
+7
+WString
+3
+LIB
+8
+WVList
+0
+9
+WVList
+0
+-1
+1
+1
+0
+10
+WPickList
+7
+11
+MItem
+3
+*.c
+12
+WString
+4
+COBJ
+13
+WVList
+1
+14
+MVState
+15
+WString
+3
+WCC
+16
+WString
+25
+n????Include directories:
+1
+17
+WString
+99
+.;..;..\..\..;..\..\..\sid;..\..\..\vicii;..\..\..\drive;..\..\..\tape;$(%watcom)\h;$(%watcom)\h\nt
+0
+18
+WVList
+0
+-1
+1
+1
+0
+19
+MItem
+21
+..\..\..\C64\c64bus.c
+20
+WString
+4
+COBJ
+21
+WVList
+0
+22
+WVList
+0
+11
+1
+1
+0
+23
+MItem
+26
+..\..\..\C64\c64keyboard.c
+24
+WString
+4
+COBJ
+25
+WVList
+0
+26
+WVList
+0
+11
+1
+1
+0
+27
+MItem
+26
+..\..\..\C64\c64parallel.c
+28
+WString
+4
+COBJ
+29
+WVList
+0
+30
+WVList
+0
+11
+1
+1
+0
+31
+MItem
+25
+..\..\..\C64\c64printer.c
+32
+WString
+4
+COBJ
+33
+WVList
+0
+34
+WVList
+0
+11
+1
+1
+0
+35
+MItem
+24
+..\..\..\C64\c64rsuser.c
+36
+WString
+4
+COBJ
+37
+WVList
+0
+38
+WVList
+0
+11
+1
+1
+0
+39
+MItem
+23
+..\..\..\C64\patchrom.c
+40
+WString
+4
+COBJ
+41
+WVList
+0
+42
+WVList
+0
+11
+1
+1
+0
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc64dtv.tgt
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc64dtv.tgt (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64commonc64dtv.tgt 2008-07-24 06:22:44 UTC (rev 19077)
@@ -0,0 +1,169 @@
+40
+targetIdent
+0
+MProject
+1
+MComponent
+0
+2
+WString
+3
+LIB
+3
+WString
+5
+n_2sn
+1
+0
+1
+4
+MCommand
+0
+5
+MCommand
+0
+6
+MItem
+19
+c64commonc64dtv.lib
+7
+WString
+3
+LIB
+8
+WVList
+0
+9
+WVList
+0
+-1
+1
+1
+0
+10
+WPickList
+6
+11
+MItem
+3
+*.c
+12
+WString
+4
+COBJ
+13
+WVList
+1
+14
+MVState
+15
+WString
+3
+WCC
+16
+WString
+25
+n????Include directories:
+1
+17
+WString
+99
+.;..;..\..\..;..\..\..\sid;..\..\..\vicii;..\..\..\drive;..\..\..\tape;$(%watcom)\h;$(%watcom)\h\nt
+0
+18
+WVList
+0
+-1
+1
+1
+0
+19
+MItem
+23
+..\..\..\C64\c64drive.c
+20
+WString
+4
+COBJ
+21
+WVList
+0
+22
+WVList
+0
+11
+1
+1
+0
+23
+MItem
+25
+..\..\..\C64\c64fastiec.c
+24
+WString
+4
+COBJ
+25
+WVList
+0
+26
+WVList
+0
+11
+1
+1
+0
+27
+MItem
+21
+..\..\..\C64\c64rom.c
+28
+WString
+4
+COBJ
+29
+WVList
+0
+30
+WVList
+0
+11
+1
+1
+0
+31
+MItem
+24
+..\..\..\C64\c64romset.c
+32
+WString
+4
+COBJ
+33
+WVList
+0
+34
+WVList
+0
+11
+1
+1
+0
+35
+MItem
+23
+..\..\..\C64\c64video.c
+36
+WString
+4
+COBJ
+37
+WVList
+0
+38
+WVList
+0
+11
+1
+1
+0
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64dtv.tgt
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/watcom/c64dtv.tgt ...
[truncated message content] |
|
From: <bla...@us...> - 2008-07-23 17:18:11
|
Revision: 19076
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19076&view=rev
Author: blackystardust
Date: 2008-07-23 17:18:20 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
Fixed for dos port of x64dtv.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/tape/tape.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/tape/tape.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/tape/tape.c 2008-07-23 16:03:24 UTC (rev 19075)
+++ branches/viceplus/v2.0-x64dtv/vice/src/tape/tape.c 2008-07-23 17:18:20 UTC (rev 19076)
@@ -401,6 +401,9 @@
const char *tape_get_file_name(void)
{
+ if (tape_image_dev1 == NULL)
+ return "";
+
return tape_image_dev1->name;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fa...@us...> - 2008-07-23 16:03:17
|
Revision: 19075
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19075&view=rev
Author: fabbo
Date: 2008-07-23 16:03:24 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
Removing unused dialogs
Modified Paths:
--------------
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resdialogs.txt
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resdialogs.txt
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resdialogs.txt 2008-07-22 23:20:35 UTC (rev 19074)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resdialogs.txt 2008-07-23 16:03:24 UTC (rev 19075)
@@ -207,14 +207,6 @@
IDC_JOY_CALIBRATE
IDC_JOY_CONFIG_A
IDC_JOY_CONFIG_B
-IDC_JOY_FIRE1_SPEED
-IDC_JOY_FIRE2_SPEED
-IDC_JOY_FIRE1_AXIS
-IDC_JOY_FIRE2_AXIS
-IDC_JOY_FIRE1_BUTTON
-IDC_JOY_FIRE2_BUTTON
-IDC_JOY_AUTOFIRE1_BUTTON
-IDC_JOY_AUTOFIRE2_BUTTON
IDD_CONFIG_KEYSET_DIALOG
IDD_CONFIG_KEYSET_DIALOG_DE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-22 23:20:27
|
Revision: 19074
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19074&view=rev
Author: blackystardust
Date: 2008-07-22 23:20:35 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Added the ui_message() function to the msdos port.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/ui.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/ui.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/ui.c 2008-07-22 17:33:22 UTC (rev 19073)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/ui.c 2008-07-22 23:20:35 UTC (rev 19074)
@@ -268,6 +268,22 @@
lib_free(tmp);
}
+void ui_message(const char *format,...)
+{
+ char *tmp;
+ va_list ap;
+
+ enable_text();
+ tui_clear_screen();
+
+ va_start(ap, format);
+ tmp = lib_mvsprintf(format, ap);
+ tui_message(tmp);
+
+ disable_text();
+ lib_free(tmp);
+}
+
ui_jam_action_t ui_jam_dialog(const char *format,...)
{
char *tmp;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2008-07-22 17:33:18
|
Revision: 19073
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19073&view=rev
Author: nojoopa
Date: 2008-07-22 17:33:22 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
added msdos UI for x64dtv
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/make-bindist.sh
branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uisid.c
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/c64dtvui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uic64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uic64dtv.h
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/Makefile.am 2008-07-22 15:30:08 UTC (rev 19072)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/Makefile.am 2008-07-22 17:33:22 UTC (rev 19073)
@@ -12,6 +12,7 @@
-I$(top_srcdir)/src/vdrive \
-I$(top_srcdir)/src/raster \
-I$(top_srcdir)/src/c64 \
+ -I$(top_srcdir)/src/c64dtv \
-I$(top_srcdir)/src/c128 \
-I$(top_srcdir)/src/vic20 \
-I$(top_srcdir)/src/pet \
@@ -29,6 +30,7 @@
archdep.h \
c128ui.c \
c64ui.c \
+ c64dtvui.c \
cbm2ui.c \
cbmcharsets.c \
cbmcharsets.h \
@@ -74,6 +76,8 @@
uic64_256k.h \
uic64cart.c \
uic64cart.h \
+ uic64dtv.c \
+ uic64dtv.h \
uicmdline.c \
uidigimax.c \
uidigimax.h \
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/c64dtvui.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/c64dtvui.c (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/c64dtvui.c 2008-07-22 17:33:22 UTC (rev 19073)
@@ -0,0 +1,343 @@
+/*
+ * c64dtvui.c - Definition of the C64DTV-specific part of the UI.
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "c64ui.h"
+#include "lib.h"
+#include "machine.h"
+#include "menudefs.h"
+#include "resources.h"
+#include "tui.h"
+#include "tuifs.h"
+#include "tuimenu.h"
+#include "types.h"
+#include "ui.h"
+#include "uic64dtv.h"
+#include "uisid.h"
+
+TUI_MENU_DEFINE_TOGGLE(VICIIVideoCache)
+TUI_MENU_DEFINE_TOGGLE(VICIICheckSsColl)
+TUI_MENU_DEFINE_TOGGLE(VICIICheckSbColl)
+TUI_MENU_DEFINE_TOGGLE(PALEmulation)
+
+static TUI_MENU_CALLBACK(toggle_MachineVideoStandard_callback)
+{
+ int value;
+
+ resources_get_int("MachineVideoStandard", &value);
+
+ if (been_activated) {
+ if (value == MACHINE_SYNC_PAL)
+ value = MACHINE_SYNC_NTSC;
+ else if (value == MACHINE_SYNC_NTSC)
+ value = MACHINE_SYNC_NTSCOLD;
+ else
+ value = MACHINE_SYNC_PAL;
+
+ resources_set_int("MachineVideoStandard", value);
+ }
+
+ switch (value) {
+ case MACHINE_SYNC_PAL:
+ return "PAL-G";
+ case MACHINE_SYNC_NTSC:
+ return "NTSC-M";
+ default:
+ return "(Custom)";
+ }
+}
+
+static TUI_MENU_CALLBACK(toggle_PALMode_callback)
+{
+ int value;
+
+ resources_get_int("PALMode", &value);
+
+ if (been_activated) {
+ value = (value + 1) % 3;
+ resources_set_int("PALMode", value);
+ }
+
+ switch (value) {
+ case 0:
+ return "Fast PAL";
+ case 1:
+ return "Y/C cable (sharp)";
+ case 2:
+ return "Composite (blurry)";
+ default:
+ return "unknown";
+ }
+}
+
+static tui_menu_item_def_t vicii_menu_items[] = {
+ { "Video _Cache:",
+ "Enable screen cache (disabled when using triple buffering)",
+ toggle_VICIIVideoCache_callback, NULL, 3,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "_PAL Emulation:",
+ "Enable PAL emulation",
+ toggle_PALEmulation_callback, NULL, 3,
+ TUI_MENU_BEH_RESUME, NULL, NULL },
+ { "PAL _Mode:",
+ "Change PAL Mode",
+ toggle_PALMode_callback, NULL, 20,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "--" },
+ { "Sprite-_Background Collisions:",
+ "Emulate sprite-background collision register",
+ toggle_VICIICheckSbColl_callback, NULL, 3,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "Sprite-_Sprite Collisions:",
+ "Emulate sprite-sprite collision register",
+ toggle_VICIICheckSsColl_callback, NULL, 3,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "V_ideo Standard:",
+ "Select machine clock ratio",
+ toggle_MachineVideoStandard_callback, NULL, 11,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+TUI_MENU_DEFINE_TOGGLE(ps2mouse)
+TUI_MENU_DEFINE_TOGGLE(Mouse)
+TUI_MENU_DEFINE_TOGGLE(EmuID)
+
+static tui_menu_item_def_t ioextenstions_menu_items[] = {
+ { "Grab mouse events",
+ "Emulate a mouse",
+ toggle_Mouse_callback, NULL, 3,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "PS/2 mouse emulation",
+ "Emulate a PS/2 mouse",
+ toggle_ps2mouse_callback, NULL, 3,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "_Emulator Identification:",
+ "Allow programs to identify the emulator they are running on",
+ toggle_EmuID_callback, NULL, 3,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+static struct {
+ const char *name;
+ const char *brief_description;
+ const char *menu_item;
+ const char *long_description;
+} palette_items[] = {
+ { "default", "Default", "_Default",
+ "Default VICE C64 palette" },
+ { "c64s", "C64S", "C64_S",
+ "Palette from the C64S emulator by Miha Peternel" },
+ { "ccs64", "CCS64", "_CCS64",
+ "Palette from the CCS64 emulator by Per Hakan Sundell" },
+ { "frodo", "Frodo", "_Frodo",
+ "Palette from the Frodo emulator by Christian Bauer" },
+ { "godot", "GoDot", "_GoDot",
+ "Palette as suggested by the authors of the GoDot C64 graphics package" }, { "pc64", "PC64", "_PC64",
+ "Palette from the PC64 emulator by Wolfgang Lorenz" },
+ { NULL }
+};
+
+static TUI_MENU_CALLBACK(palette_callback)
+{
+ if (been_activated) {
+ if (resources_set_string("VICIIPaletteFile", (const char *)param) < 0)
+ tui_error("Invalid palette file");
+ ui_update_menus();
+ }
+ return NULL;
+}
+
+static TUI_MENU_CALLBACK(custom_palette_callback)
+{
+ if (been_activated) {
+ char *name;
+
+ name = tui_file_selector("Load custom palette",
+ NULL, "*.vpl", NULL, 0, NULL, 0, NULL, NULL);
+
+ if (name != NULL) {
+ if (resources_set_string("VICIIPaletteFile", name) < 0)
+ tui_error("Invalid palette file");
+ ui_update_menus();
+ lib_free(name);
+ }
+ }
+ return NULL;
+}
+
+static TUI_MENU_CALLBACK(palette_menu_callback)
+{
+ const char *s;
+ int i;
+
+ resources_get_string("VICIIPaletteFile", &s);
+ for (i = 0; palette_items[i].name != NULL; i++) {
+ if (strcmp(s, palette_items[i].name) == 0)
+ return palette_items[i].brief_description;
+ }
+ return "Custom";
+}
+
+TUI_MENU_DEFINE_TOGGLE(VICIIExternalPalette)
+
+static void add_palette_submenu(tui_menu_t parent)
+{
+ int i;
+ tui_menu_t palette_menu = tui_menu_create("Color Set", 1);
+
+ for (i = 0; palette_items[i].name != NULL; i++)
+ tui_menu_add_item(palette_menu,
+ palette_items[i].menu_item,
+ palette_items[i].long_description,
+ palette_callback,
+ (void *) palette_items[i].name, 0,
+ TUI_MENU_BEH_RESUME);
+
+ tui_menu_add_item(palette_menu,
+ "C_ustom",
+ "Load a custom palette",
+ custom_palette_callback,
+ NULL, 0,
+ TUI_MENU_BEH_RESUME);
+
+ tui_menu_add_item(parent, "Use external Palette",
+ "Use the palette file below",
+ toggle_VICIIExternalPalette_callback,
+ NULL, 3, TUI_MENU_BEH_RESUME);
+
+ tui_menu_add_submenu(parent, "Color _Palette:",
+ "Choose color palette",
+ palette_menu,
+ palette_menu_callback,
+ NULL,
+ 10);
+}
+
+/* ------------------------------------------------------------------------- */
+
+static TUI_MENU_CALLBACK(load_rom_file_callback)
+{
+ if (been_activated) {
+ char *name;
+
+ name = tui_file_selector("Load ROM file",
+ NULL, "*", NULL, 0, NULL, 0, NULL, NULL);
+
+ if (name != NULL) {
+ if (resources_set_string(param, name) < 0)
+ ui_error("Could not load ROM file '%s'", name);
+ lib_free(name);
+ }
+ }
+ return NULL;
+}
+
+static tui_menu_item_def_t rom_menu_items[] = {
+ { "--" },
+ { "Load new _Kernal ROM...",
+ "Load new Kernal ROM",
+ load_rom_file_callback, "KernalName", 0,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "Load new _BASIC ROM...",
+ "Load new BASIC ROM",
+ load_rom_file_callback, "BasicName", 0,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "Load new _Character ROM...",
+ "Load new Character ROM",
+ load_rom_file_callback, "ChargenName", 0,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "Load new 15_41 ROM...",
+ "Load new 1541 ROM",
+ load_rom_file_callback, "DosName1541", 0,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "Load new 1541-_II ROM...",
+ "Load new 1541-II ROM",
+ load_rom_file_callback, "DosName1541ii", 0,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "Load new 15_71 ROM...",
+ "Load new 1571 ROM",
+ load_rom_file_callback, "DosName1571", 0,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "Load new 15_81 ROM...",
+ "Load new 1581 ROM",
+ load_rom_file_callback, "DosName1581", 0,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "Load new _2031 ROM...",
+ "Load new 2031 ROM",
+ load_rom_file_callback, "DosName2031", 0,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "Load new _1001 ROM...",
+ "Load new 1001 ROM",
+ load_rom_file_callback, "DosName1001", 0,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+int c64dtvui_init(void)
+{
+ tui_menu_t ui_ioextensions_submenu;
+
+ ui_create_main_menu(1, 1, 1, 2, 1);
+
+ tui_menu_add_separator(ui_special_submenu);
+
+ uic64dtv_init(ui_special_submenu);
+ tui_menu_add_separator(ui_special_submenu);
+
+ ui_ioextensions_submenu = tui_menu_create("I/O extensions", 1);
+ tui_menu_add(ui_ioextensions_submenu, ioextenstions_menu_items);
+ tui_menu_add_submenu(ui_special_submenu, "_I/O extensions...",
+ "Configure I/O extensions",
+ ui_ioextensions_submenu, NULL, 0,
+ TUI_MENU_BEH_CONTINUE);
+
+ tui_menu_add_separator(ui_video_submenu);
+
+ add_palette_submenu(ui_video_submenu);
+
+ tui_menu_add(ui_video_submenu, vicii_menu_items);
+ tui_menu_add(ui_sound_submenu, sid_ui_menu_items);
+ tui_menu_add(ui_rom_submenu, rom_menu_items);
+
+ return 0;
+}
+
+void c64dtvui_shutdown(void)
+{
+}
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/make-bindist.sh
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/make-bindist.sh 2008-07-22 15:30:08 UTC (rev 19072)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/make-bindist.sh 2008-07-22 17:33:22 UTC (rev 19073)
@@ -12,7 +12,7 @@
ZIPKIND=$4
TOPSRCDIR=$5
-if [ ! -e src/x64.exe -o ! -e src/x128.exe -o ! -e src/xvic.exe -o ! -e src/xpet.exe -o ! -e src/xplus4.exe -o ! -e src/xcbm2.exe -o ! -e src/c1541.exe -o ! -e src/petcat.exe -o ! -e src/cartconv.exe ]
+if [ ! -e src/x64.exe -o ! -e src/x64dtv.exe -o ! -e src/x128.exe -o ! -e src/xvic.exe -o ! -e src/xpet.exe -o ! -e src/xplus4.exe -o ! -e src/xcbm2.exe -o ! -e src/c1541.exe -o ! -e src/petcat.exe -o ! -e src/cartconv.exe ]
then
echo Error: executable file\(s\) not found, do a \"make\" first
exit 1
@@ -22,6 +22,7 @@
rm -f -r dosvice
mkdir dosvice
$STRIP src/x64.exe
+$STRIP src/x64dtv.exe
$STRIP src/x128.exe
$STRIP src/xvic.exe
$STRIP src/xpet.exe
@@ -30,10 +31,10 @@
$STRIP src/c1541.exe
$STRIP src/petcat.exe
$STRIP src/cartconv.exe
-cp src/x64.exe src/x128.exe src/xvic.exe dosvice
+cp src/x64.exe src/x64dtv.exe src/x128.exe src/xvic.exe dosvice
cp src/xpet.exe src/xplus4.exe src/xcbm2.exe dosvice
cp src/c1541.exe src/petcat.exe src/cartconv.exe dosvice
-cp -a $TOPSRCDIR/data/C128 $TOPSRCDIR/data/C64 $TOPSRCDIR/data/CBM-II $TOPSRCDIR/data/DRIVES dosvice
+cp -a $TOPSRCDIR/data/C128 $TOPSRCDIR/data/C64 $TOPSRCDIR/data/C64DTV $TOPSRCDIR/data/CBM-II $TOPSRCDIR/data/DRIVES dosvice
cp -a $TOPSRCDIR/data/PET $TOPSRCDIR/data/PLUS4 $TOPSRCDIR/data/PRINTER $TOPSRCDIR/data/VIC20 dosvice
cp -a $TOPSRCDIR/data/fonts dosvice
cp -a $TOPSRCDIR/doc/html dosvice
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uic64dtv.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uic64dtv.c (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uic64dtv.c 2008-07-22 17:33:22 UTC (rev 19073)
@@ -0,0 +1,134 @@
+/*
+ * uic64dtv.c - C64DTV UI interface for MS-DOS.
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+
+#include "resources.h"
+#include "tui.h"
+#include "tuimenu.h"
+#include "uic64dtv.h"
+
+TUI_MENU_DEFINE_RADIO(DtvRevision)
+TUI_MENU_DEFINE_RADIO(HummerUserportJoyPort)
+TUI_MENU_DEFINE_TOGGLE(c64dtvromrw)
+TUI_MENU_DEFINE_TOGGLE(HummerUserportJoy)
+
+static TUI_MENU_CALLBACK(DtvRevision_submenu_callback)
+{
+ int value;
+ static char s[10];
+
+ resources_get_int("DtvRevision", &value);
+ sprintf(s, "DTV%d", value);
+ return s;
+}
+
+static TUI_MENU_CALLBACK(HummerUserportJoyPort_submenu_callback)
+{
+ int value;
+ static char s[10];
+
+ resources_get_int("HummerUserportJoyPort", &value);
+ sprintf(s, "Joy%d", value);
+ return s;
+}
+
+static tui_menu_item_def_t DtvRevision_submenu[] = {
+ { "DTV_2", NULL, radio_DtvRevision_callback,
+ (void *)2, 7, TUI_MENU_BEH_CLOSE, NULL, NULL },
+ { "DTV_3", NULL, radio_DtvRevision_callback,
+ (void *)3, 7, TUI_MENU_BEH_CLOSE, NULL, NULL },
+ { NULL }
+};
+
+static tui_menu_item_def_t HummerUserportJoyPort_submenu[] = {
+ { "Joy_1", NULL, radio_HummerUserportJoyPort_callback,
+ (void *)1, 7, TUI_MENU_BEH_CLOSE, NULL, NULL },
+ { "Joy_2", NULL, radio_HummerUserportJoyPort_callback,
+ (void *)2, 7, TUI_MENU_BEH_CLOSE, NULL, NULL },
+ { NULL }
+};
+
+static TUI_MENU_CALLBACK(c64dtvromfilename_callback)
+{
+ char s[256];
+ const char *v;
+
+ if (been_activated) {
+
+ *s = '\0';
+
+ if (tui_input_string("Change C64DTV ROM image name",
+ "New image name:", s, 255) == -1)
+ return NULL;
+
+ if (*s == '\0')
+ return NULL;
+
+ resources_set_string("c64dtvromfilename", s);
+ }
+
+ resources_get_string("c64dtvromfilename", &v);
+
+ return v;
+}
+
+static tui_menu_item_def_t c64dtv_menu_items[] = {
+ { "C64DTV ROM _image file:", "Select the C64DTV ROM image file",
+ c64dtvromfilename_callback, NULL, 20,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "C64DTV revision:", "Select the revision of the C64DTV",
+ DtvRevision_submenu_callback, NULL, 11,
+ TUI_MENU_BEH_CONTINUE, DtvRevision_submenu,
+ "C64DTV revision" },
+ { "C64DTV ROM _write enabled:", "C64DTV ROM is writable",
+ toggle_c64dtvromrw_callback, NULL, 3,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "Hummer Userport joystick enabled:", "Hummer Userport joystick enabled",
+ toggle_HummerUserportJoy_callback, NULL, 3,
+ TUI_MENU_BEH_CONTINUE, NULL, NULL },
+ { "Joystick mapped to Hummer Userport:", "Select the joystick to be mapped",
+ HummerUserportJoyPort_submenu_callback, NULL, 11,
+ TUI_MENU_BEH_CONTINUE, HummerUserportJoyPort_submenu,
+ "HummerUserportJoyPort" },
+ { NULL }
+};
+
+void uic64dtv_init(struct tui_menu *parent_submenu)
+{
+ tui_menu_t ui_c64dtv_submenu;
+
+ ui_c64dtv_submenu = tui_menu_create("C64DTV settings", 1);
+
+ tui_menu_add(ui_c64dtv_submenu, c64dtv_menu_items);
+
+ tui_menu_add_submenu(parent_submenu, "_C64DTV settings...",
+ "C64DTV settings",
+ ui_c64dtv_submenu, NULL, 0,
+ TUI_MENU_BEH_CONTINUE);
+}
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uic64dtv.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uic64dtv.h (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uic64dtv.h 2008-07-22 17:33:22 UTC (rev 19073)
@@ -0,0 +1,34 @@
+/*
+ * uic64dtv.h - C64DTV UI interface for MS-DOS.
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef UIC64DTV_H
+#define UIC64DTV_H
+
+struct tui_menu;
+
+extern void uic64dtv_init(struct tui_menu *parent_submenu);
+
+#endif
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uisid.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uisid.c 2008-07-22 15:30:08 UTC (rev 19072)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/msdos/uisid.c 2008-07-22 17:33:22 UTC (rev 19073)
@@ -55,6 +55,12 @@
case SID_MODEL_8580D:
sprintf(s, "8580 + digi boost");
break;
+ case SID_MODEL_6581R4:
+ sprintf(s, "6581R4 (not yet implemented)");
+ break;
+ case SID_MODEL_DTVSID:
+ sprintf(s, "DTVSID");
+ break;
}
return s;
@@ -73,6 +79,14 @@
"SID 8580 + digi boost emulation",
radio_SidModel_callback, (void *)SID_MODEL_8580D, 0,
TUI_MENU_BEH_CLOSE, NULL, NULL },
+ { "6581_R4 (not yet implemented)",
+ "SID 6581R4 emulation",
+ radio_SidModel_callback, (void *)SID_MODEL_6581R4, 0,
+ TUI_MENU_BEH_CLOSE, NULL, NULL },
+ { "_DTVSID",
+ "DTVSID emulation",
+ radio_SidModel_callback, (void *)SID_MODEL_DTVSID, 0,
+ TUI_MENU_BEH_CLOSE, NULL, NULL },
{ NULL }
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-22 15:30:00
|
Revision: 19072
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19072&view=rev
Author: blackystardust
Date: 2008-07-22 15:30:08 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Updated *nix make-bindist.sh files to include x64dtv.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/build/minix3/build.sh
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/hpux/make-bindist.sh
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/qnx4/make-bindist.sh
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/qnx6/make-bindist.sh
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/sco_sol/make-bindist.sh
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/skyos/make-bindist.sh
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/skyos/icons/x64dtv.ico
Modified: branches/viceplus/v2.0-x64dtv/vice/build/minix3/build.sh
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/build/minix3/build.sh 2008-07-22 13:33:07 UTC (rev 19071)
+++ branches/viceplus/v2.0-x64dtv/vice/build/minix3/build.sh 2008-07-22 15:30:08 UTC (rev 19072)
@@ -1,7 +1,8 @@
#!/bin/sh
-AR=ar RANLIB=true CC=cc bigsh configure --prefix=/usr/local --without-resid --disable-nls
+binsizes xxl
+AR=ar RANLIB=true CC=cc ./configure --prefix=/usr/local --without-resid --disable-nls
make
make install
-for b in x64 x128 xvic xplus4 xpet xcbm2 petcat c1541 cartconv
+for b in x64 x64dtv x128 xvic xplus4 xpet xcbm2 petcat c1541 cartconv
do chmem +10000000 /usr/local/bin/$b
done
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/hpux/make-bindist.sh
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/hpux/make-bindist.sh 2008-07-22 13:33:07 UTC (rev 19071)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/hpux/make-bindist.sh 2008-07-22 15:30:08 UTC (rev 19072)
@@ -64,7 +64,7 @@
exit 1
fi
-if [ ! -e src/x64 -o ! -e src/x128 -o ! -e src/xvic -o ! -e src/xpet -o ! -e src/xplus4 -o ! -e src/xcbm2 -o ! -e src/c1541 -o ! -e src/petcat -o ! -e src/cartconv ]
+if [ ! -e src/x64 -o ! -e src/x64dtv -o ! -e src/x128 -o ! -e src/xvic -o ! -e src/xpet -o ! -e src/xplus4 -o ! -e src/xcbm2 -o ! -e src/c1541 -o ! -e src/petcat -o ! -e src/cartconv ]
then
echo Error: executable file\(s\) not found, do a \"make all\" first
exit 1
@@ -88,6 +88,7 @@
mkdir -p vice/vice-RUN/usr/local/lib/vice/doc/images
mkdir -p vice/vice-RUN/usr/local/lib/vice/fonts
mkdir -p vice/vice-RUN/usr/local/lib/vice/CBM-II
+mkdir -p vice/vice-RUN/usr/local/lib/vice/C64DTV
mkdir -p vice/vice-RUN/usr/local/lib/vice/C64
mkdir -p vice/vice-RUN/usr/local/lib/vice/C128
mkdir -p vice/vice-RUN/usr/local/info
@@ -114,6 +115,8 @@
installfile src/x128 vice/vice-RUN runtmp /usr/local/bin/x128 run 0755
$STRIP src/x64
installfile src/x64 vice/vice-RUN runtmp /usr/local/bin/x64 run 0755
+$STRIP src/x64dtv
+installfile src/x64dtv vice/vice-RUN runtmp /usr/local/bin/x64dtv run 0755
$STRIP src/xcbm2
installfile src/xcbm2 vice/vice-RUN runtmp /usr/local/bin/xcbm2 run 0755
$STRIP src/xpet
@@ -165,6 +168,21 @@
installfile data/C64/vice.vpl vice/vice-RUN runtmp /usr/local/lib/vice/C64/vice.vpl run 0644
installfile data/C64/x11_pos.vkm vice/vice-RUN runtmp /usr/local/lib/vice/C64/x11_pos.vkm run 0644
installfile data/C64/x11_sym.vkm vice/vice-RUN runtmp /usr/local/lib/vice/C64/x11_sym.vkm run 0644
+installfile data/C64DTV/basic vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/basic run 0644
+installfile data/C64DTV/c64hq.vpl vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/c64hq.vpl run 0644
+installfile data/C64DTV/c64mem.sym vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/c64mem.sym run 0644
+installfile data/C64DTV/c64s.vpl vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/c64s.vpl run 0644
+installfile data/C64DTV/ccs64.vpl vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/ccs64.vpl run 0644
+installfile data/C64DTV/chargen vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/chargen run 0644
+installfile data/C64DTV/default.vpl vice/vice-RUN runtmp /usr/local/lib/viceDTV/C64/default.vpl run 0644
+installfile data/C64DTV/default.vrs vice/vice-RUN runtmp /usr/local/lib/viceDTV/C64/default.vrs run 0644
+installfile data/C64DTV/frodo.vpl vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/frodo.vpl run 0644
+installfile data/C64DTV/godot.vpl vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/godot.vpl run 0644
+installfile data/C64DTV/kernal vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/kernal run 0644
+installfile data/C64DTV/pc64.vpl vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/pc64.vpl run 0644
+installfile data/C64DTV/vice.vpl vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/vice.vpl run 0644
+installfile data/C64DTV/x11_pos.vkm vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/x11_pos.vkm run 0644
+installfile data/C64DTV/x11_sym.vkm vice/vice-RUN runtmp /usr/local/lib/vice/C64DTV/x11_sym.vkm run 0644
installfile data/CBM-II/amber.vpl vice/vice-RUN runtmp /usr/local/lib/vice/CBM-II/amber.vpl run 0644
installfile data/CBM-II/basic.128 vice/vice-RUN runtmp /usr/local/lib/vice/CBM-II/basic.128 run 0644
installfile data/CBM-II/basic.256 vice/vice-RUN runtmp /usr/local/lib/vice/CBM-II/basic.256 run 0644
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/qnx4/make-bindist.sh
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/qnx4/make-bindist.sh 2008-07-22 13:33:07 UTC (rev 19071)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/qnx4/make-bindist.sh 2008-07-22 15:30:08 UTC (rev 19072)
@@ -16,7 +16,7 @@
exit 1
fi
-if [ ! -e /usr/local/bin/x64 -o ! -e /usr/local/bin/x128 -o ! -e /usr/local/bin/xvic -o ! -e /usr/local/bin/xpet -o ! -e /usr/local/bin/xplus4 -o ! -e /usr/local/bin/xcbm2 -o ! -e /usr/local/bin/c1541 -o ! -e /usr/local/bin/petcat -o ! -e /usr/local/bin/cartconv ]
+if [ ! -e /usr/local/bin/x64 -o ! -e /usr/local/bin/x64dtv -o ! -e /usr/local/bin/x128 -o ! -e /usr/local/bin/xvic -o ! -e /usr/local/bin/xpet -o ! -e /usr/local/bin/xplus4 -o ! -e /usr/local/bin/xcbm2 -o ! -e /usr/local/bin/c1541 -o ! -e /usr/local/bin/petcat -o ! -e /usr/local/bin/cartconv ]
then
echo Error: \"make install\" needs to be done first
exit 1
@@ -30,6 +30,7 @@
echo Generating QNX 4 port binary distribution.
wstrip /usr/local/bin/vsid
wstrip /usr/local/bin/x64
+wstrip /usr/local/bin/x64dtv
wstrip /usr/local/bin/x128
wstrip /usr/local/bin/xvic
wstrip /usr/local/bin/xpet
@@ -39,7 +40,7 @@
wstrip /usr/local/bin/petcat
wstrip /usr/local/bin/cartconv
cp $TOPSRCDIR/src/arch/unix/qnx4/install_msg ./
-tar cf vice-$VICEVERSION-qnx4.tar install_msg /usr/local/bin/vsid /usr/local/bin/x64 /usr/local/bin/x128 /usr/local/bin/xvic /usr/local/bin/xpet /usr/local/bin/xplus4 /usr/local/bin/xcbm2 /usr/local/bin/c1541 /usr/local/bin/petcat /usr/local/bin/cartconv /usr/local/lib/vice /usr/local/man/man1/c1541.1 /usr/local/man/man1/petcat.1 /usr/local/man/man1/vice.1 /usr/local/info/vice.info*
+tar cf vice-$VICEVERSION-qnx4.tar install_msg /usr/local/bin/vsid /usr/local/bin/x64 /usr/local/bin/x64dtv /usr/local/bin/x128 /usr/local/bin/xvic /usr/local/bin/xpet /usr/local/bin/xplus4 /usr/local/bin/xcbm2 /usr/local/bin/c1541 /usr/local/bin/petcat /usr/local/bin/cartconv /usr/local/lib/vice /usr/local/man/man1/c1541.1 /usr/local/man/man1/petcat.1 /usr/local/man/man1/vice.1 /usr/local/info/vice.info*
freeze vice-$VICEVERSION-qnx4.tar
rm -f install_msg
echo QNX 4 port binary distribution directory generated as vice-$VICEVERSION-qnx4.tar.F
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/qnx6/make-bindist.sh
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/qnx6/make-bindist.sh 2008-07-22 13:33:07 UTC (rev 19071)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/qnx6/make-bindist.sh 2008-07-22 15:30:08 UTC (rev 19072)
@@ -24,7 +24,7 @@
exit 1
fi
-if [ ! -e src/x64 -o ! -e src/x128 -o ! -e src/xvic -o ! -e src/xpet -o ! -e src/xplus4 -o ! -e src/xcbm2 -o ! -e src/c1541 -o ! -e src/petcat -o ! -e src/cartconv ]
+if [ ! -e src/x64 -o ! -e src/x64dtv -o ! -e src/x128 -o ! -e src/xvic -o ! -e src/xpet -o ! -e src/xplus4 -o ! -e src/xcbm2 -o ! -e src/c1541 -o ! -e src/petcat -o ! -e src/cartconv ]
then
echo Error: \"make\" needs to be done first
exit 1
@@ -35,6 +35,7 @@
curdir=`pwd`
$MAKECOMMAND prefix=$curdir/VICE-$VICEVERSION/opt VICEDIR=$curdir/VICE-$VICEVERSION/opt/lib/vice install
$STRIP VICE-$VICEVERSION/opt/bin/x64
+$STRIP VICE-$VICEVERSION/opt/bin/x64dtv
$STRIP VICE-$VICEVERSION/opt/bin/x128
$STRIP VICE-$VICEVERSION/opt/bin/xvic
$STRIP VICE-$VICEVERSION/opt/bin/xpet
@@ -185,6 +186,7 @@
<QPM:File>cartconv</QPM:File>
<QPM:File>x128</QPM:File>
<QPM:File>x64</QPM:File>
+ <QPM:File>x64dtv</QPM:File>
<QPM:File>xcbm2</QPM:File>
<QPM:File>xpet</QPM:File>
<QPM:File>xplus4</QPM:File>
@@ -379,6 +381,24 @@
<QPM:File>x11_sym.vkm</QPM:File>
</QPM:Dir>
+ <QPM:Dir name="C64DTV">
+ <QPM:File>basic</QPM:File>
+ <QPM:File>c64hq.vpl</QPM:File>
+ <QPM:File>c64mem.sym</QPM:File>
+ <QPM:File>c64s.vpl</QPM:File>
+ <QPM:File>ccs64.vpl</QPM:File>
+ <QPM:File>chargen</QPM:File>
+ <QPM:File>default.vpl</QPM:File>
+ <QPM:File>default.vrs</QPM:File>
+ <QPM:File>frodo.vpl</QPM:File>
+ <QPM:File>godot.vpl</QPM:File>
+ <QPM:File>kernal</QPM:File>
+ <QPM:File>pc64.vpl</QPM:File>
+ <QPM:File>vice.vpl</QPM:File>
+ <QPM:File>x11_pos.vkm</QPM:File>
+ <QPM:File>x11_sym.vkm</QPM:File>
+ </QPM:Dir>
+
<QPM:Dir name="CBM-II">
<QPM:File>amber.vpl</QPM:File>
<QPM:File>basic.128</QPM:File>
@@ -585,6 +605,7 @@
<QPM:Union link="../../../opt/lib/vice/DRIVES">DRIVES</QPM:Union>
<QPM:Union link="../../../opt/lib/vice/CBM-II">CBM-II</QPM:Union>
<QPM:Union link="../../../opt/lib/vice/C64">C64</QPM:Union>
+ <QPM:Union link="../../../opt/lib/vice/C64DTV">C64DTV</QPM:Union>
<QPM:Union link="../../../opt/lib/vice/C128">C128</QPM:Union>
</QPM:Dir>
</QPM:Dir>
@@ -609,6 +630,18 @@
<QPM:String name="Icon" value="/usr/share/icons/topics/chameleon.gif"/>
</QPM:Launch>
+ <QPM:Launch name="x64dtv">
+ <QPM:String name="Topic" value="Applications/Emulators"/>
+ <QPM:String name="Command" value="/opt/bin/x64dtv"/>
+ <QPM:String name="Icon" value="/usr/share/icons/topics/chameleon.gif"/>
+ </QPM:Launch>
+
+ <QPM:Launch name="x64dtv (no sound)">
+ <QPM:String name="Topic" value="Applications/Emulators"/>
+ <QPM:String name="Command" value="/opt/bin/x64dtv -sounddev dummy"/>
+ <QPM:String name="Icon" value="/usr/share/icons/topics/chameleon.gif"/>
+ </QPM:Launch>
+
<QPM:Launch name="x128">
<QPM:String name="Topic" value="Applications/Emulators"/>
<QPM:String name="Command" value="/opt/bin/x128"/>
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/sco_sol/make-bindist.sh
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/sco_sol/make-bindist.sh 2008-07-22 13:33:07 UTC (rev 19071)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/sco_sol/make-bindist.sh 2008-07-22 15:30:08 UTC (rev 19072)
@@ -88,7 +88,7 @@
exit 1
fi
-if [ ! -e src/x64 -o ! -e src/x128 -o ! -e src/xvic -o ! -e src/xpet -o ! -e src/xplus4 -o ! -e src/xcbm2 -o ! -e src/c1541 -o ! -e src/petcat -o ! -e src/cartconv ]
+if [ ! -e src/x64 -o ! -e src/x64dtv -o ! -e src/x128 -o ! -e src/xvic -o ! -e src/xpet -o ! -e src/xplus4 -o ! -e src/xcbm2 -o ! -e src/c1541 -o ! -e src/petcat -o ! -e src/cartconv ]
then
echo Error: \"make\" needs to be done first
exit 1
@@ -99,6 +99,7 @@
curdir=`pwd`
$MAKECOMMAND -e prefix=$curdir/VICE-$VICEVERSION/usr/local VICEDIR=$curdir/VICE-$VICEVERSION/usr/local/lib/vice install
$STRIP VICE-$VICEVERSION/usr/local/bin/x64
+$STRIP VICE-$VICEVERSION/usr/local/bin/x64dtv
$STRIP VICE-$VICEVERSION/usr/local/bin/x128
$STRIP VICE-$VICEVERSION/usr/local/bin/xvic
$STRIP VICE-$VICEVERSION/usr/local/bin/xpet
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/skyos/icons/x64dtv.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/skyos/make-bindist.sh
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/skyos/make-bindist.sh 2008-07-22 13:33:07 UTC (rev 19071)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/skyos/make-bindist.sh 2008-07-22 15:30:08 UTC (rev 19072)
@@ -17,7 +17,7 @@
exit 1
fi
-if [ ! -e /boot/programs/VICE/bin/x64 -o ! -e /boot/programs/VICE/bin/x128 -o ! -e /boot/programs/VICE/bin/xvic -o ! -e /boot/programs/VICE/bin/xpet -o ! -e /boot/programs/VICE/bin/xplus4 -o ! -e /boot/programs/VICE/bin/xcbm2 -o ! -e /boot/programs/VICE/bin/c1541 -o ! -e /boot/programs/VICE/bin/petcat -o ! -e /boot/programs/VICE/bin/cartconv ]
+if [ ! -e /boot/programs/VICE/bin/x64 -o ! -e /boot/programs/VICE/bin/x64dtv -o ! -e /boot/programs/VICE/bin/x128 -o ! -e /boot/programs/VICE/bin/xvic -o ! -e /boot/programs/VICE/bin/xpet -o ! -e /boot/programs/VICE/bin/xplus4 -o ! -e /boot/programs/VICE/bin/xcbm2 -o ! -e /boot/programs/VICE/bin/c1541 -o ! -e /boot/programs/VICE/bin/petcat -o ! -e /boot/programs/VICE/bin/cartconv ]
then
echo Error: \"make install\" needs to be done first
exit 1
@@ -44,6 +44,8 @@
mv /boot/programs/VICE/bin/vsid VICE-$VERSION/programs/VICE/bin
mv /boot/programs/VICE/bin/x64 VICE-$VERSION/programs/VICE/bin/x64.app
$STRIP VICE-$VERSION/programs/VICE/bin/x64.app
+mv /boot/programs/VICE/bin/x64dtv VICE-$VERSION/programs/VICE/bin/x64dtv.app
+$STRIP VICE-$VERSION/programs/VICE/bin/x64dtv.app
mv /boot/programs/VICE/bin/x128 VICE-$VERSION/programs/VICE/bin/x128.app
$STRIP VICE-$VERSION/programs/VICE/bin/x128.app
mv /boot/programs/VICE/bin/xvic VICE-$VERSION/programs/VICE/bin/xvic.app
@@ -94,6 +96,7 @@
[PANELMENU]
/menu="Emulators/VICE" /name="x64" /link="/boot/programs/VICE/bin/x64.app" /icon="/boot/programs/VICE/icons/x64.ico"
+/menu="Emulators/VICE" /name="x64dtv" /link="/boot/programs/VICE/bin/x64dtv.app" /icon="/boot/programs/VICE/icons/x64dtv.ico"
/menu="Emulators/VICE" /name="x128" /link="/boot/programs/VICE/bin/x128.app" /icon="/boot/programs/VICE/icons/x128.ico"
/menu="Emulators/VICE" /name="xcbm2" /link="/boot/programs/VICE/bin/xcbm2.app" /icon="/boot/programs/VICE/icons/xcbm2.ico"
/menu="Emulators/VICE" /name="xpet" /link="/boot/programs/VICE/bin/xpet.app" /icon="/boot/programs/VICE/icons/xpet.ico"
@@ -102,6 +105,7 @@
[FILEICONS]
/file="\$INSTALL_ROOT/programs/VICE/bin/x64.app" /icon="/boot/programs/VICE/icons/x64.ico"
+/file="\$INSTALL_ROOT/programs/VICE/bin/x64dtv.app" /icon="/boot/programs/VICE/icons/x64dtv.ico"
/file="\$INSTALL_ROOT/programs/VICE/bin/x128.app" /icon="/boot/programs/VICE/icons/x128.ico"
/file="\$INSTALL_ROOT/programs/VICE/bin/xcbm2.app" /icon="/boot/programs/VICE/icons/xcbm2.ico"
/file="\$INSTALL_ROOT/programs/VICE/bin/xpet.app" /icon="/boot/programs/VICE/icons/xpet.ico"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fa...@us...> - 2008-07-22 13:32:59
|
Revision: 19071
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19071&view=rev
Author: fabbo
Date: 2008-07-22 13:33:07 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Remove resources that are not used anymore
Modified Paths:
--------------
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/res.rc
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/res.rc
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/res.rc 2008-07-22 13:12:16 UTC (rev 19070)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/res.rc 2008-07-22 13:33:07 UTC (rev 19071)
@@ -1129,29 +1129,9 @@
GROUPBOX "Joystick in port #&1",IDC_STATIC,7,5,102,113
COMBOBOX IDC_JOY_DEV1,12,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "Select fire button",IDC_STATIC,12,34,70,8
- COMBOBOX IDC_JOY_FIRE1_BUTTON,12,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Auto fire button settings",IDC_STATIC,12,61,93,8
- LTEXT "Autofire &speed (1..32)",IDC_STATIC,12,74,70,8
- EDITTEXT IDC_JOY_FIRE1_SPEED, 87,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE1_AXIS, 12,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE1_BUTTON, 12,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
GROUPBOX "Joystick in port #&2",IDC_STATIC,117,5,102,113
COMBOBOX IDC_JOY_DEV2,122,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "Select fire button",IDC_STATIC,122,34,70,8
- COMBOBOX IDC_JOY_FIRE2_BUTTON,122,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Auto fire button settings",IDC_STATIC,122,61,93,8
- LTEXT "Autofire &speed (1..32)",IDC_STATIC,122,74,70,8
- EDITTEXT IDC_JOY_FIRE2_SPEED, 197,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE2_AXIS, 122,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE2_BUTTON, 122,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
PUSHBUTTON "Config Keyset &A", IDC_JOY_CONFIG_A,
8,120,60,14, WS_TABSTOP
PUSHBUTTON "Config Keyset &B", IDC_JOY_CONFIG_B,
@@ -1173,29 +1153,9 @@
GROUPBOX "Joystick in Port #&1",IDC_STATIC,7,5,102,113
COMBOBOX IDC_JOY_DEV1,12,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "Feuerknopf selektieren",IDC_STATIC,12,34,70,8
- COMBOBOX IDC_JOY_FIRE1_BUTTON,12,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Automatische Feuerknopf Einstellungen",IDC_STATIC,12,61,93,8
- LTEXT "Autofeuer Ge&schwindigkeit (1..32)",IDC_STATIC,12,74,70,8
- EDITTEXT IDC_JOY_FIRE1_SPEED, 87,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE1_AXIS, 12,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE1_BUTTON, 12,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
GROUPBOX "Joystick in Port #&2",IDC_STATIC,117,5,102,113
COMBOBOX IDC_JOY_DEV2,122,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "Feuerknopf selektieren",IDC_STATIC,122,34,70,8
- COMBOBOX IDC_JOY_FIRE2_BUTTON,122,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Automatische Feuerknopf Einstellungen",IDC_STATIC,122,61,93,8
- LTEXT "Autofeuer Ge&schwindigkeit (1..32)",IDC_STATIC,122,74,70,8
- EDITTEXT IDC_JOY_FIRE2_SPEED, 197,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE2_AXIS, 122,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE2_BUTTON, 122,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
PUSHBUTTON "Tastaturbelegung &A konfigurieren", IDC_JOY_CONFIG_A,
8,120,60,14, WS_TABSTOP
PUSHBUTTON "Tastaturbelegung &B konfigurieren", IDC_JOY_CONFIG_B,
@@ -1217,29 +1177,9 @@
GROUPBOX "Joystick dans le port #1",IDC_STATIC,7,5,102,113
COMBOBOX IDC_JOY_DEV1,12,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "S\xE9lectionner le bouton de feu",IDC_STATIC,12,34,70,8
- COMBOBOX IDC_JOY_FIRE1_BUTTON,12,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Auto fire button settings",IDC_STATIC,12,61,93,8
- LTEXT "Vitesse tir automatique (1..32)",IDC_STATIC,12,74,70,8
- EDITTEXT IDC_JOY_FIRE1_SPEED, 87,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE1_AXIS, 12,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE1_BUTTON, 12,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
GROUPBOX "Joystick dans le port #2",IDC_STATIC,117,5,102,113
COMBOBOX IDC_JOY_DEV2,122,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "S\xE9lectionner le bouton de feu",IDC_STATIC,122,34,70,8
- COMBOBOX IDC_JOY_FIRE2_BUTTON,122,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Auto fire button settings",IDC_STATIC,122,61,93,8
- LTEXT "Vitesse tir automatique (1..32)",IDC_STATIC,122,74,70,8
- EDITTEXT IDC_JOY_FIRE2_SPEED, 197,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE2_AXIS, 122,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE2_BUTTON, 122,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
PUSHBUTTON "Configurer &A", IDC_JOY_CONFIG_A,
8,120,60,14, WS_TABSTOP
PUSHBUTTON "Configurer &B", IDC_JOY_CONFIG_B,
@@ -1262,29 +1202,9 @@
GROUPBOX "Botkorm\xE1ny az &1-es porton",IDC_STATIC,7,5,102,113
COMBOBOX IDC_JOY_DEV1,12,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "V\xE1lasszon t\xFBz gombot",IDC_STATIC,12,34,70,8
- COMBOBOX IDC_JOY_FIRE1_BUTTON,12,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Automatikus t\xFBz be\xE1ll\xEDt\xE1sai",IDC_STATIC,12,61,93,8
- LTEXT "Automatikus t\xFBz sebess\xE9ge (1..32)",IDC_STATIC,12,74,70,8
- EDITTEXT IDC_JOY_FIRE1_SPEED, 87,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE1_AXIS, 12,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE1_BUTTON, 12,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
GROUPBOX "Botkorm\xE1ny a &2-es porton",IDC_STATIC,117,5,102,113
COMBOBOX IDC_JOY_DEV2,122,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "V\xE1lasszon t\xFBz gombot",IDC_STATIC,122,34,70,8
- COMBOBOX IDC_JOY_FIRE2_BUTTON,122,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Automatikus t\xFBz be\xE1ll\xEDt\xE1sai",IDC_STATIC,122,61,93,8
- LTEXT "Automatikus t\xFBz sebess\xE9ge (1..32)",IDC_STATIC,122,74,70,8
- EDITTEXT IDC_JOY_FIRE2_SPEED, 197,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE2_AXIS, 122,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE2_BUTTON, 122,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
PUSHBUTTON "'&A' gombk\xE9szlet be\xE1ll\xEDt\xE1sa", IDC_JOY_CONFIG_A,
8,120,60,14, WS_TABSTOP
PUSHBUTTON "'&B' gombk\xE9szlet be\xE1ll\xEDt\xE1sa", IDC_JOY_CONFIG_B,
@@ -1307,29 +1227,9 @@
GROUPBOX "Joystick nella porta #&1",IDC_STATIC,7,5,102,113
COMBOBOX IDC_JOY_DEV1,12,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "Seleziona pulsante di fuoco",IDC_STATIC,12,34,70,8
- COMBOBOX IDC_JOY_FIRE1_BUTTON,12,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Impostazioni fuoco automatico",IDC_STATIC,12,61,93,8
- LTEXT "&Velocit\xE0 autofire (1..32)",IDC_STATIC,12,74,70,8
- EDITTEXT IDC_JOY_FIRE1_SPEED, 87,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE1_AXIS, 12,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE1_BUTTON, 12,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
GROUPBOX "Joystick nella porta #&2",IDC_STATIC,117,5,102,113
COMBOBOX IDC_JOY_DEV2,122,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "Seleziona pulsante di fuoco",IDC_STATIC,122,34,70,8
- COMBOBOX IDC_JOY_FIRE2_BUTTON,122,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Impostazioni fuoco automatico",IDC_STATIC,122,61,93,8
- LTEXT "&Velocit\xE0 autofire (1..32)",IDC_STATIC,122,74,70,8
- EDITTEXT IDC_JOY_FIRE2_SPEED, 197,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE2_AXIS, 122,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE2_BUTTON, 122,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
PUSHBUTTON "Configura il keyset &A", IDC_JOY_CONFIG_A,
8,120,60,14, WS_TABSTOP
PUSHBUTTON "Configura il keyset &B", IDC_JOY_CONFIG_B,
@@ -1351,29 +1251,9 @@
GROUPBOX "Joystick in poort #&1",IDC_STATIC,7,5,102,113
COMBOBOX IDC_JOY_DEV1,12,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "Selecteer vuur knop",IDC_STATIC,12,34,70,8
- COMBOBOX IDC_JOY_FIRE1_BUTTON,12,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Autofire knop instellingen",IDC_STATIC,12,61,93,8
- LTEXT "Autofire &snelheid (1..32)",IDC_STATIC,12,74,70,8
- EDITTEXT IDC_JOY_FIRE1_SPEED, 87,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE1_AXIS, 12,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE1_BUTTON, 12,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
GROUPBOX "Joystick in poort #&2",IDC_STATIC,117,5,102,113
COMBOBOX IDC_JOY_DEV2,122,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "Selecteer vuur knop",IDC_STATIC,122,34,70,8
- COMBOBOX IDC_JOY_FIRE2_BUTTON,122,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Autofire knop instellingen",IDC_STATIC,122,61,93,8
- LTEXT "Autofire &snelheid (1..32)",IDC_STATIC,122,74,70,8
- EDITTEXT IDC_JOY_FIRE2_SPEED, 197,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE2_AXIS, 122,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE2_BUTTON, 122,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
PUSHBUTTON "Configureer Keyset &A", IDC_JOY_CONFIG_A,
1,120,74,14, WS_TABSTOP
PUSHBUTTON "Configureer Keyset &B", IDC_JOY_CONFIG_B,
@@ -1396,29 +1276,9 @@
GROUPBOX "Joystick w porcie #&1",IDC_STATIC,7,5,102,113
COMBOBOX IDC_JOY_DEV1,12,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "Select fire button",IDC_STATIC,12,34,70,8
- COMBOBOX IDC_JOY_FIRE1_BUTTON,12,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Auto fire button settings",IDC_STATIC,12,61,93,8
- LTEXT "Autofire &speed (1..32)",IDC_STATIC,12,74,70,8
- EDITTEXT IDC_JOY_FIRE1_SPEED, 87,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE1_AXIS, 12,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE1_BUTTON, 12,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
GROUPBOX "Joystick w porcie #&2",IDC_STATIC,117,5,102,113
COMBOBOX IDC_JOY_DEV2,122,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "Select fire button",IDC_STATIC,122,34,70,8
- COMBOBOX IDC_JOY_FIRE2_BUTTON,122,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Auto fire button settings",IDC_STATIC,122,61,93,8
- LTEXT "Autofire &speed (1..32)",IDC_STATIC,122,74,70,8
- EDITTEXT IDC_JOY_FIRE2_SPEED, 197,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE2_AXIS, 122,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE2_BUTTON, 122,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
PUSHBUTTON "Config Keyset &A", IDC_JOY_CONFIG_A,
8,120,60,14, WS_TABSTOP
PUSHBUTTON "Config Keyset &B", IDC_JOY_CONFIG_B,
@@ -1441,29 +1301,9 @@
GROUPBOX "Styrspak i spelport &1",IDC_STATIC,7,5,102,113
COMBOBOX IDC_JOY_DEV1,12,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "V\xE4lj avtryckarknapp",IDC_STATIC,12,34,70,8
- COMBOBOX IDC_JOY_FIRE1_BUTTON,12,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Inst\xE4llningar f\xF6r autofire",IDC_STATIC,12,61,93,8
- LTEXT "&Hastighet f\xF6r autofire (1..32)",IDC_STATIC,12,74,70,8
- EDITTEXT IDC_JOY_FIRE1_SPEED, 87,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE1_AXIS, 12,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE1_BUTTON, 12,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
GROUPBOX "Styrspak i spelport &2",IDC_STATIC,117,5,102,113
COMBOBOX IDC_JOY_DEV2,122,16,93,68,CBS_DROPDOWNLIST |
WS_GROUP | WS_TABSTOP
- LTEXT "V\xE4lj avtryckarknapp",IDC_STATIC,122,34,70,8
- COMBOBOX IDC_JOY_FIRE2_BUTTON,122,47,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- LTEXT "Inst\xE4llningar f\xF6r autofire",IDC_STATIC,122,61,93,8
- LTEXT "&Hastighet f\xF6r autofire (1..32)",IDC_STATIC,122,74,70,8
- EDITTEXT IDC_JOY_FIRE2_SPEED, 197,72,18,12,WS_TABSTOP | 0x2000L
- COMBOBOX IDC_JOY_FIRE2_AXIS, 122,87,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
- COMBOBOX IDC_JOY_AUTOFIRE2_BUTTON, 122,102,93,60,
- CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL
PUSHBUTTON "Tangentupps\xE4ttning &A", IDC_JOY_CONFIG_A,
8,120,60,14, WS_TABSTOP
PUSHBUTTON "Tangentupps\xE4ttning &B", IDC_JOY_CONFIG_B,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
19 messages has been excluded from this view by a project administrator.