|
From: <ama...@us...> - 2008-07-21 20:44:44
|
Revision: 19065
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19065&view=rev
Author: amatthies
Date: 2008-07-21 20:44:51 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Updated MSVC project files to compile x64dtv.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/arch.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/monitor.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vicii.dsp
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64c64dtv.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtv.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/viciidtv.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/x64dtv.dsp
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am 2008-07-21 16:34:58 UTC (rev 19064)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am 2008-07-21 20:44:51 UTC (rev 19065)
@@ -318,6 +318,9 @@
c128.dsp \
c1541.dsp \
c64.dsp \
+ c64c64dtv.dsp \
+ c64dtv.dsp \
+ c64dtvstubs.dsp \
c64c128.dsp \
c64cart.dsp \
c64exp.dsp \
@@ -365,9 +368,11 @@
vdrive.dsp \
vic20.dsp \
vicii.dsp \
+ viciidtv.dsp \
video.dsp \
x128.dsp \
x64.dsp \
+ x64dtv.dsp \
xcbm2.dsp \
xpet.dsp \
xplus4.dsp \
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/arch.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/arch.dsp 2008-07-21 16:34:58 UTC (rev 19064)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/arch.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "libs\arch\Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\c64" /I "..\..\c128" /I "..\..\vic20" /I "..\..\pet" /I "..\..\cbm2" /I "..\..\raster" /I "..\..\monitor" /I "..\..\lib\libffmpeg" /I "..\..\plus4" /I "..\..\sid" /I ".\msvc\wpcap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\c128" /I "..\..\vic20" /I "..\..\pet" /I "..\..\cbm2" /I "..\..\raster" /I "..\..\monitor" /I "..\..\lib\libffmpeg" /I "..\..\plus4" /I "..\..\sid" /I ".\msvc\wpcap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# PROP Intermediate_Dir "libs\arch\Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\c64" /I "..\..\c128" /I "..\..\vic20" /I "..\..\pet" /I "..\..\cbm2" /I "..\..\raster" /I "..\..\monitor" /I "..\..\lib\libffmpeg" /I "..\..\plus4" /I "..\..\sid" /I ".\msvc\wpcap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\c128" /I "..\..\vic20" /I "..\..\pet" /I "..\..\cbm2" /I "..\..\raster" /I "..\..\monitor" /I "..\..\lib\libffmpeg" /I "..\..\plus4" /I "..\..\sid" /I ".\msvc\wpcap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -98,6 +98,10 @@
# End Source File
# Begin Source File
+SOURCE=.\c64dtvui.c
+# End Source File
+# Begin Source File
+
SOURCE=.\catweaselmkiii.c
# End Source File
# Begin Source File
@@ -243,6 +247,10 @@
# End Source File
# Begin Source File
+SOURCE=.\uic64dtv.c
+# End Source File
+# Begin Source File
+
SOURCE=.\uicart.c
# End Source File
# Begin Source File
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64c64dtv.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64c64dtv.dsp (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64c64dtv.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -0,0 +1,128 @@
+# Microsoft Developer Studio Project File - Name="c64c64dtv" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=c64c64dtv - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "c64c64dtv.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "c64c64dtv.mak" CFG="c64c64dtv - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "c64c64dtv - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "c64c64dtv - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "c64c64dtv - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libs\c64c64dtv\Release"
+# PROP Intermediate_Dir "libs\c64c64dtv\Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\raster" /I "..\..\monitor" /I "..\..\rs232drv" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "c64c64dtv - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libs\c64c64dtv\Debug"
+# PROP Intermediate_Dir "libs\c64c64dtv\Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\raster" /I "..\..\monitor" /I "..\..\rs232drv" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "c64c64dtv - Win32 Release"
+# Name "c64c64dtv - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\c64\c64bus.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64drive.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64fastiec.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64keyboard.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64parallel.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64printer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64rom.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64romset.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64rsuser.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64video.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\patchrom.c
+# End Source File
+# End Target
+# End Project
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtv.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtv.dsp (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtv.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -0,0 +1,160 @@
+# Microsoft Developer Studio Project File - Name="c64dtv" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=c64dtv - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "c64dtv.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "c64dtv.mak" CFG="c64dtv - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "c64dtv - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "c64dtv - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "c64dtv - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libs\c64dtv\Release"
+# PROP Intermediate_Dir "libs\c64dtv\Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\c64" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "c64dtv - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libs\c64dtv\Debug"
+# PROP Intermediate_Dir "libs\c64dtv\Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\c64" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "c64dtv - Win32 Release"
+# Name "c64dtv - Win32 Debug"
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvmemsnapshot.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvmem.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvmemrom.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvcpu.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvblitter.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvdma.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvflash.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtv-cmdline-options.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtv-resources.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtv-snapshot.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtv.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvcia1.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvcia2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtviec.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvmeminit.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvpla.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvsound.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\flash-trap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\hummeradc.c
+# End Source File
+# End Target
+# End Project
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -0,0 +1,92 @@
+# Microsoft Developer Studio Project File - Name="c64dtvstubs" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=c64dtvstubs - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "c64dtvstubs.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "c64dtvstubs.mak" CFG="c64dtvstubs - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "c64dtvstubs - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "c64dtvstubs - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "c64dtvstubs - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libs\c64dtv\Release"
+# PROP Intermediate_Dir "libs\c64dtv\Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\c64" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "c64dtvstubs - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libs\c64dtv\Debug"
+# PROP Intermediate_Dir "libs\c64dtv\Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\c64" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "c64dtvstubs - Win32 Release"
+# Name "c64dtvstubs - Win32 Debug"
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvcart.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvtfe.c"
+# End Source File
+# End Target
+# End Project
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/monitor.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/monitor.dsp 2008-07-21 16:34:58 UTC (rev 19064)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/monitor.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -86,6 +86,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\monitor\asm6502dtv.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\monitor\asmz80.c
# End Source File
# Begin Source File
@@ -142,6 +146,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\monitor\mon_register6502dtv.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\monitor\mon_registerz80.c
# End Source File
# Begin Source File
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw 2008-07-21 16:34:58 UTC (rev 19064)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw 2008-07-21 20:44:51 UTC (rev 19065)
@@ -15,6 +15,9 @@
Project_Dep_Name x64
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name x64dtv
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name x128
End Project Dependency
Begin Project Dependency
@@ -165,6 +168,21 @@
###############################################################################
+Project: "c64c64dtv"=".\c64c64dtv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name base
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "c64cart"=".\c64cart.dsp" - Package Owner=<4>
Package=<5>
@@ -180,6 +198,36 @@
###############################################################################
+Project: "c64dtv"=".\c64dtv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name base
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "c64dtvstubs"=".\c64dtvstubs.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name base
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "c64exp"=".\c64exp.dsp" - Package Owner=<4>
Package=<5>
@@ -727,6 +775,21 @@
End Project Dependency
}}}
+##############################################################################
+
+Project: "viciidtv"=".\viciidtv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name base
+ End Project Dependency
+}}}
+
###############################################################################
Project: "video"=".\video.dsp" - Package Owner=<4>
@@ -963,6 +1026,117 @@
###############################################################################
+Project: "x64dtv"=".\x64dtv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name arch
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name base
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name c64c64dtv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name c64dtv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name c64dtvstubs
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name drive
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fileio
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fsdevice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name gfxoutputdrv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iec
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name c64exp
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iecieee
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name ieee
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name parallel
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name png
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name printerdrv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name resid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name rs232drv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name serial
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name sid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name sounddrv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name viciidtv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name raster
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name vdrive
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name video
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name monitor
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name c64cart
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name diskimage
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name tape
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name imagecontents
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name core
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iecbus
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name zlib
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "xcbm2"=".\xcbm2.dsp" - Package Owner=<4>
Package=<5>
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vicii.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vicii.dsp 2008-07-21 16:34:58 UTC (rev 19064)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vicii.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "libs\vicii\Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# PROP Intermediate_Dir "libs\vicii\Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -130,6 +130,10 @@
# End Source File
# Begin Source File
+SOURCE="..\..\vicii\vicii-stubs.c"
+# End Source File
+# Begin Source File
+
SOURCE="..\..\vicii\vicii-timing.c"
# End Source File
# Begin Source File
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/viciidtv.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/viciidtv.dsp (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/viciidtv.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -0,0 +1,136 @@
+# Microsoft Developer Studio Project File - Name="viciidtv" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=viciidtv - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "viciidtv.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "viciidtv.mak" CFG="viciidtv - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "viciidtv - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "viciidtv - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "viciidtv - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libs\viciidtv\Release"
+# PROP Intermediate_Dir "libs\viciidtv\Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "viciidtv - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libs\viciidtv\Debug"
+# PROP Intermediate_Dir "libs\viciidtv\Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "viciidtv - Win32 Release"
+# Name "viciidtv - Win32 Debug"
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-badline.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-cmdline-options.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\viciidtv-color.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\viciidtv-draw.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-fetch.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-irq.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-mem.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-phi1.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-resources.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\viciidtv-snapshot.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-sprites.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-timing.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\vicii\vicii.c
+# End Source File
+# End Target
+# End Project
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/x64dtv.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/x64dtv.dsp (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/x64dtv.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -0,0 +1,138 @@
+# Microsoft Developer Studio Project File - Name="x64dtv" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=x64dtv - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "x64dtv.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "x64dtv.mak" CFG="x64dtv - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "x64dtv - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "x64dtv - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "x64dtv - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\data"
+# PROP Intermediate_Dir "libs\x64dtv\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\monitor" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i ".\MSVC" /i ".\\" /i "..\..\\" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib winmm.lib ddraw.lib dsound.lib dinput.lib dxguid.lib wsock32.lib version.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF "$(CFG)" == "x64dtv - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\data"
+# PROP Intermediate_Dir "libs\x64dtv\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\monitor" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i ".\MSVC" /i ".\\" /i "..\..\\" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 dxguid.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib winmm.lib ddraw.lib dsound.lib dinput.lib wsock32.lib version.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "x64dtv - Win32 Release"
+# Name "x64dtv - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\main.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ps2mouse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\resc64dtv.rc
+
+!IF "$(CFG)" == "x64dtv - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__RESC6="resc64dtv.rc" "res.rc" "resdrivec64.rc" "ressid.rc" "resvicii.rc"
+# Begin Custom Build
+InputPath=.\resc64dtv.rc
+
+"resc64dtvcat.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy /b resc64dtv.rc + res.rc + resdrivec64.rc + ressid.rc + resvicii.rc resc64dtvcat.rc /b
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "x64dtv - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__RESC6="resc64dtv.rc" "res.rc" "resdrivec64.rc" "ressid.rc" "resvicii.rc"
+# Begin Custom Build
+InputPath=.\resc64dtv.rc
+
+"resc64dtvcat.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy /b resc64dtv.rc + res.rc + resdrivec64.rc + ressid.rc + resvicii.rc resc64dtvcat.rc /b
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\resc64dtvcat.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\vice.manifest
+# End Source File
+# End Target
+# End Project
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|