From: Toni Wilen Date: Sat, 14 May 2016 17:07:28 +0000 (+0300) Subject: 3300b13 X-Git-Tag: 3300~29 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=749e397f0beee5c8c437ba65d0cc7c6825f8544f;p=francis%2Fwinuae.git 3300b13 --- diff --git a/akiko.cpp b/akiko.cpp index b7563222..2f59e0e2 100644 --- a/akiko.cpp +++ b/akiko.cpp @@ -1086,6 +1086,10 @@ static void cdrom_run_read (void) put_byte (cdrom_addressdata + seccnt * 4096 + 0xc00 + i, 0); cdrom_pbx &= ~(1 << seccnt); set_status (CDINTERRUPT_PBX); + + if ((cdrom_flags & CDFLAG_RAW) || !(cdrom_flags & CDFLAG_CAS)) + write_log(_T("Akiko warning: Flags = %08x!\n"), cdrom_flags); + } else { inc = 0; } diff --git a/cia.cpp b/cia.cpp index 475653e6..9a09c609 100644 --- a/cia.cpp +++ b/cia.cpp @@ -58,6 +58,12 @@ #define TOD_HACK +/* Akiko internal CIA differences: + +- BFE101 and BFD100: reads 3F if data direction is in. + + */ + /* e-clock is 10 CPU cycles, 4 cycles high, 6 low * data transfer happens during 4 high cycles */ diff --git a/include/xwin.h b/include/xwin.h index cd53c44e..370726a8 100644 --- a/include/xwin.h +++ b/include/xwin.h @@ -58,6 +58,7 @@ extern bool show_screen_maybe (bool); extern int lockscr (struct vidbuffer*, bool); extern void unlockscr (struct vidbuffer*); extern bool target_graphics_buffer_update (void); +extern double target_adjust_vblank_hz(double); void getgfxoffset (float *dxp, float *dyp, float *mxp, float *myp); double getcurrentvblankrate (void); /* todo: remove from od-win32/win32gfx.h */ diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 82b7c7bb..c5c699c0 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -2012,7 +2012,7 @@ BEGIN IDS_WSTYLE_EXTENDED "Extended" IDS_MISCLISTITEMS1 "Untrap = middle button\nShow GUI on startup\nUse CTRL-F11 to quit\nDon't show taskbar button\nDon't show notification icon\n" IDS_MISCLISTITEMS2 "Always on top\nDisable screensaver\nSynchronize clock\nOne second reboot pause\nFaster RTG\nClipboard sharing\nAllow native code\n" - IDS_MISCLISTITEMS3 "Native on-screen display\nRTG on-screen display\nCreate winuaelog.txt log\nLog illegal memory accesses\nBlank unused displays\nStart mouse uncaptured\nStart minimized\nMinimize when focus is lost\n100/120Hz VSync black frame insertion\nMaster floppy write protection\nMaster harddrive write protection\nHide all UAE autoconfig boards\n" + IDS_MISCLISTITEMS3 "Native on-screen display\nRTG on-screen display\nCreate winuaelog.txt log\nLog illegal memory accesses\nBlank unused displays\nStart mouse uncaptured\nStart minimized\nMinimize when focus is lost\nBlack frame insertion\nMaster floppy write protection\nMaster harddrive write protection\nHide all UAE autoconfig boards\n" IDS_JOYMODE_WHEELMOUSE "Wheel Mouse" IDS_NUMSG_KS68030PLUS "The selected system ROM requires a 68030 or higher CPU." IDS_SELECTTAPE "Select a Tape directory or archive file..." @@ -2036,7 +2036,7 @@ BEGIN IDS_NUMSG_UAEBOOTROM_PCC "PPC native OS booted with incompatible UAE boot ROM enabled.\nSelect ROM panel ""New UAE (128k, ROM, Indirect)"" option\nor disable all UAE expansions.\n" IDS_AUTOSCALE_OVERSCAN_BLANK "Overscan blanking" - IDS_SCREEN_ADAPTIVE_SYNC "Adaptive Sync" + IDS_SCREEN_ADAPTIVE_SYNC "Variable Sync" END #endif // English resources diff --git a/od-win32/srcrelease.cmd b/od-win32/srcrelease.cmd index 651aed43..81a8428b 100644 --- a/od-win32/srcrelease.cmd +++ b/od-win32/srcrelease.cmd @@ -124,16 +124,7 @@ rm -rf fullrelease rm -rf test cd .. -cd winuae_msvc10 -rm -rf debug -rm -rf release -rm -rf fullrelease -rm -rf ipch -rm -rf test -rm -rf x64 -cd .. - -cd winuae_msvc11 +cd winuae_msvc14 rm -rf debug rm -rf release rm -rf fullrelease @@ -141,7 +132,7 @@ rm -rf test rm -rf x64 cd .. -cd winuae_msvc14 +cd winuae_msvc15 rm -rf debug rm -rf release rm -rf fullrelease diff --git a/od-win32/win32.h b/od-win32/win32.h index bf275bc9..8203cff9 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -20,12 +20,12 @@ #define LANG_DLL_FULL_VERSION_MATCH 1 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("12") +#define WINUAEBETA _T("13") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2016, 4, 30) +#define WINUAEDATE MAKEBD(2016, 5, 14) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index eb6cc159..65fc2ad4 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -1708,6 +1708,7 @@ static void show_rom_list (void) 130, -1, -1, // m-tec 129, 141, -1, -1, // adide 133, -1, -1, // adscsi + 161, -1, -1, // trumpcard pro 127, 140, -1, -1, // kommos 128, -1, -1, // vector falcon 132, -1, -1, // add500 @@ -1762,6 +1763,7 @@ static void show_rom_list (void) _T("M-Tec AT500 IDE\0") _T("AdIDE\0") _T("AdSCSI\0") + _T("IVS Trumpcard Pro/GrandSlam\0") _T("Kommos A500/A2000 SCSI\0") _T("Vector Falcon 8000 SCSI\0") _T("Archos ADD-500\0") @@ -7644,7 +7646,7 @@ static void values_from_chipsetdlg2 (HWND hDlg, UINT msg, WPARAM wParam, LPARAM TCHAR txt[32], *p; int v; - if (workprefs.cs_compatible != ischecked(hDlg, IDC_CS_COMPATIBLE)) { + if (!!workprefs.cs_compatible != ischecked(hDlg, IDC_CS_COMPATIBLE)) { if (ischecked(hDlg, IDC_CS_COMPATIBLE)) { if (!cs_compatible) cs_compatible = CP_GENERIC; @@ -8592,7 +8594,7 @@ static void values_from_expansion2dlg(HWND hDlg) brc = get_device_rom(&workprefs, expansionroms[scsiromselected].romtype, scsiromselectednum, &index); if (brc && brc->roms[index].romfile[0]) changed = true; - clear_device_rom(&workprefs, expansionroms[scsiromselected].romtype, scsiromselectednum); + clear_device_rom(&workprefs, expansionroms[scsiromselected].romtype, scsiromselectednum, true); } if (changed) { init_expansion2(hDlg, false); @@ -8605,7 +8607,7 @@ static void values_from_expansion2dlg(HWND hDlg) brc = get_device_rom_new(&workprefs, ROMTYPE_CPUBOARD, 0, &index); getromfile(hDlg, IDC_CPUBOARDROMFILE, brc->roms[index].romfile, sizeof(brc->roms[index].romfile) / sizeof(TCHAR)); } else { - clear_device_rom(&workprefs, ROMTYPE_CPUBOARD, 0); + clear_device_rom(&workprefs, ROMTYPE_CPUBOARD, 0, true); } } @@ -8844,7 +8846,7 @@ static void set_expansion_rtg_rom(void) const struct expansionromtype *ert = &expansionroms[i]; if (ert->deviceflags & EXPANSIONTYPE_RTG) { if ((ert->romtype & ROMTYPE_MASK) != (romtype & ROMTYPE_MASK)) { - clear_device_rom(&workprefs, ert->romtype, 0); + clear_device_rom(&workprefs, ert->romtype, 0, true); } } } diff --git a/od-win32/winuae_msvc10/winuae_msvc.sln b/od-win32/winuae_msvc10/winuae_msvc.sln deleted file mode 100644 index 485999ec..00000000 --- a/od-win32/winuae_msvc10/winuae_msvc.sln +++ /dev/null @@ -1,274 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winuae", "winuae_msvc.vcxproj", "{4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencpu", "..\gencpu_msvc\gencpu_msvc.vcxproj", "{DEF7ACF7-050E-4069-BB99-5B5D93F60521}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencomp", "..\gencomp_msvc\gencomp_msvc.vcxproj", "{54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genblitter", "..\genblitter_msvc\genblitter_msvc.vcxproj", "{765B0AF0-B8D3-4998-89AF-D6F939E1CD18}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build68k", "..\build68k_msvc\build68k_msvc.vcxproj", "{AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "singlefilehelper", "..\singlefilehelper\singlefilehelper.vcxproj", "{DAF2EB1A-546A-41B3-9755-187562C01E3C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resourcedll", "..\resourcedll\resourcedll.vcxproj", "{C85288FB-A035-42CA-B5FB-8E6214319E97}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdrawcmd", "..\fdrawcmd\fdrawcmd.vcxproj", "{960E83B5-9118-4EBD-AF50-18EFC1DC764B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipctester", "..\ipctester\ipctester.vcxproj", "{79BDABE6-5308-4D64-8884-A5A35909D8D3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genlinetoscr", "..\genlinetoscr_msvc\genlinetoscr_msvc.vcxproj", "{E9F73E11-A463-45C6-A733-2BED75852BA1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decompress", "..\decompress\decompress.vcxproj", "{38FAC3FB-A2B7-453F-8A6A-73B97201BB04}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uaeunp", "..\uaeunp\uaeunp.vcxproj", "{6181E50C-5F32-42DC-BEF6-827AA8A5429D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "consolewrapper", "..\consolewrapper\consolewrapper.vcxproj", "{2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prowizard", "..\prowizard\prowizard.vcxproj", "{8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unpackers", "..\unpackers\unpackers.vcxproj", "{98BA115B-829F-4085-9729-ABD0D779A60A}" -EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "wix", "..\wix\wix.wixproj", "{BE211CE1-3955-4674-A664-5038FC791980}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - FullRelease|Mixed Platforms = FullRelease|Mixed Platforms - FullRelease|Win32 = FullRelease|Win32 - FullRelease|x64 = FullRelease|x64 - FullRelease|x86 = FullRelease|x86 - Release|Mixed Platforms = Release|Mixed Platforms - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Mixed Platforms.Build.0 = Debug|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Win32.ActiveCfg = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Win32.Build.0 = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x64.ActiveCfg = Debug|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x64.Build.0 = Debug|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x86.ActiveCfg = Debug|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Mixed Platforms.Build.0 = FullRelease|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Win32.Build.0 = FullRelease|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x64.ActiveCfg = FullRelease|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x64.Build.0 = FullRelease|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x86.ActiveCfg = FullRelease|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Mixed Platforms.ActiveCfg = Release|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Mixed Platforms.Build.0 = Release|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Win32.ActiveCfg = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Win32.Build.0 = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.ActiveCfg = Release|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.Build.0 = Release|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x86.ActiveCfg = Release|x64 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Win32.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x64.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x86.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Win32.ActiveCfg = Release|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x64.ActiveCfg = Release|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x86.ActiveCfg = Release|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Win32.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x64.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x86.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Win32.ActiveCfg = Release|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x64.ActiveCfg = Release|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x86.ActiveCfg = Release|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Win32.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x64.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x86.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Win32.ActiveCfg = Release|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x64.ActiveCfg = Release|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x86.ActiveCfg = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Win32.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x64.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x86.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Win32.ActiveCfg = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x64.ActiveCfg = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x86.ActiveCfg = Release|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Debug|Win32.ActiveCfg = Debug|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Debug|x64.ActiveCfg = Debug|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Debug|x86.ActiveCfg = Debug|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|Win32.ActiveCfg = Release|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|x64.ActiveCfg = Release|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|x86.ActiveCfg = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Win32.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x64.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x86.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Win32.ActiveCfg = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x64.ActiveCfg = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x86.ActiveCfg = Release|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Debug|Win32.ActiveCfg = Debug|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Debug|x64.ActiveCfg = Debug|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Debug|x86.ActiveCfg = Debug|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|Win32.ActiveCfg = Release|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|x64.ActiveCfg = Release|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|x86.ActiveCfg = Release|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Debug|Win32.ActiveCfg = Debug|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Debug|x64.ActiveCfg = Debug|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Debug|x86.ActiveCfg = Debug|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|Win32.ActiveCfg = Release|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|x64.ActiveCfg = Release|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|x86.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Win32.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x64.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x86.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Win32.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x64.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x86.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Debug|Win32.ActiveCfg = Debug|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Debug|x64.ActiveCfg = Debug|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Debug|x86.ActiveCfg = Debug|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.FullRelease|Mixed Platforms.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.FullRelease|Win32.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.FullRelease|x64.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.FullRelease|x86.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|Win32.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|x64.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|x86.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|Win32.ActiveCfg = Debug|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|x64.ActiveCfg = Debug|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|x86.ActiveCfg = Debug|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|Mixed Platforms.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|Win32.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|x64.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|x86.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|Win32.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|x64.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|x86.ActiveCfg = Release|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|Mixed Platforms.Build.0 = Debug|x64 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|x64.ActiveCfg = Debug|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|x86.ActiveCfg = Debug|x64 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.FullRelease|Mixed Platforms.ActiveCfg = Release|x64 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.FullRelease|Win32.ActiveCfg = Release|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.FullRelease|x64.ActiveCfg = Release|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.FullRelease|x86.ActiveCfg = Release|x64 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|Mixed Platforms.ActiveCfg = Release|x64 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|Win32.ActiveCfg = Release|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|x64.ActiveCfg = Release|x64 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|x86.ActiveCfg = Release|x64 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|Mixed Platforms.Build.0 = Debug|x64 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|Win32.ActiveCfg = Debug|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|x64.ActiveCfg = Debug|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|x86.ActiveCfg = Debug|x64 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|Mixed Platforms.ActiveCfg = Release|x64 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|Win32.ActiveCfg = Release|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|x64.ActiveCfg = Release|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|x86.ActiveCfg = Release|x64 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|Mixed Platforms.ActiveCfg = Release|x64 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|Win32.ActiveCfg = Release|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|x64.ActiveCfg = Release|x64 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|x86.ActiveCfg = Release|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|Mixed Platforms.Build.0 = Debug|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|Win32.ActiveCfg = Debug|Win32 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|x64.ActiveCfg = Debug|Win32 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|x86.ActiveCfg = Debug|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|Mixed Platforms.ActiveCfg = Release|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|Win32.ActiveCfg = Release|Win32 - {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|x64.ActiveCfg = Release|Win32 - {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|x86.ActiveCfg = Release|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|Mixed Platforms.ActiveCfg = Release|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|Win32.ActiveCfg = Release|Win32 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|x64.ActiveCfg = Release|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|x86.ActiveCfg = Release|x64 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Win32.ActiveCfg = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|x64.ActiveCfg = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|x86.ActiveCfg = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|x86.Build.0 = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|Mixed Platforms.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|Win32.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|x64.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|x86.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|x86.Build.0 = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Release|Win32.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Release|x64.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Release|x86.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/od-win32/winuae_msvc10/winuae_msvc.vcxproj b/od-win32/winuae_msvc10/winuae_msvc.vcxproj deleted file mode 100644 index d51bfe4e..00000000 --- a/od-win32/winuae_msvc10/winuae_msvc.vcxproj +++ /dev/null @@ -1,842 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - FullRelease - Win32 - - - FullRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - winuae - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA} - winuae - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - Unicode - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - d:\amiga\ - $(Configuration)\ - true - true - d:\amiga\ - $(Platform)\$(Configuration)\ - true - true - d:\amiga\ - $(Configuration)\ - false - d:\amiga\ - $(Platform)\$(Configuration)\ - false - true - d:\amiga\ - $(Configuration)\ - false - true - d:\amiga\ - $(Platform)\$(Configuration)\ - false - true - winuae64 - winuae64 - winuae64 - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;C:\dev\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;C:\dev\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - $(ReferencePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;$(LibraryPath) - true - true - true - C:\dev\include;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath) - C:\dev\lib\x64;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\lib\x64;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\lib\x64;$(LibraryPath) - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/winuae_msvc.tlb - - - %(AdditionalOptions) - Disabled - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\tun;%(AdditionalIncludeDirectories) - WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions) - false - false - false - Sync - EnableFastChecks - MultiThreadedDebug - true - false - .\Debug/winuae_msvc.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - StdCall - Default - 4996;%(DisableSpecificWarnings) - false - false - %(ForcedIncludeFiles) - true - Disabled - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9d.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;wintab32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;prowizard.lib;lzmalib.lib;libFLAC_static.lib;Avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;%(AdditionalDependencies) - NotSet - $(OutDir)$(TargetName)$(TargetExt) - true - LIBCMT;%(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs) - true - .\Debug/winuae.pdb - Windows - 2621440 - 2621440 - true - false - - - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - - - - - ../resources/winuae.exe.manifest - true - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/winuae_msvc.tlb - - - %(AdditionalOptions) - Disabled - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\tun;%(AdditionalIncludeDirectories) - WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - false - $(Platform)\$(Configuration)\winuae_msvc.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Level3 - true - ProgramDatabase - StdCall - Default - 4996;%(DisableSpecificWarnings) - false - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;wntab32x.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - LIBCMT;%(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs) - true - $(Platform)\$(Configuration)\winuae.pdb - Windows - 2621440 - 2621440 - true - false - - - MachineX64 - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - - - - - ..\resources\winuae64.exe.manifest - true - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/winuae_msvc.tlb - - - Full - AnySuitable - true - Speed - true - false - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;%(PreprocessorDefinitions) - true - Sync - Default - MultiThreaded - false - true - NotSet - Precise - false - false - - - .\Release/winuae_msvc.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - StdCall - Default - 4996;%(DisableSpecificWarnings) - %(ForcedIncludeFiles) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;wintab32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;libFLAC_static.lib;Avrt.lib;hid.lib;zlibstat.lib;Iphlpapi.lib;luastatic.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - %(AdditionalManifestDependencies) - %(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs) - true - .\Release/winuae.pdb - Windows - 2621440 - 2621440 - true - true - true - - - true - false - true - MachineX86 - - - - - - - ../resources/winuae.exe.manifest - true - $(IntDir)$(TargetName)$(TargetExt).embed.manifest - /validate_manifest %(AdditionalOptions) - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/winuae_msvc.tlb - - - Full - OnlyExplicitInline - true - Speed - true - false - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions) - true - Sync - Default - MultiThreadedDLL - false - true - NotSet - Precise - false - false - NotUsing - $(Platform)\$(Configuration)/winuae_msvc.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Level3 - true - StdCall - Default - 4996;%(DisableSpecificWarnings) - %(ForcedIncludeFiles) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;wntab32x.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;%(AdditionalDependencies) - NotSet - $(OutDir)$(TargetName)$(TargetExt) - true - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - LIBCMT;%(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs) - true - $(Platform)\$(Configuration)\winuae.pdb - Windows - 0 - 0 - true - true - - - true - false - true - MachineX64 - - - ..\resources\winuae64.exe.manifest - true - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/winuae_msvc.tlb - - - Full - AnySuitable - true - Speed - true - true - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;%(PreprocessorDefinitions) - true - Sync - Default - MultiThreaded - false - true - NotSet - Precise - false - false - - - .\FullRelease/winuae_msvc.pch - .\FullRelease/ - .\FullRelease/ - .\FullRelease/ - Level3 - true - StdCall - Default - 4996;%(DisableSpecificWarnings) - %(ForcedIncludeFiles) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;wintab32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;avrt.lib;enet.lib;prowizard.lib;lzmalib.lib;libFLAC_static.lib;Avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - %(AdditionalManifestDependencies) - %(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs) - true - .\FullRelease/winuae.pdb - Windows - 2621440 - 2621440 - true - true - true - UseLinkTimeCodeGeneration - true - false - true - MachineX86 - - - - - ../resources/winuae.exe.manifest - true - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/winuae_msvc.tlb - - - Full - AnySuitable - true - Speed - true - true - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions) - true - Sync - Default - MultiThreadedDLL - false - true - NotSet - Precise - false - false - - - $(Platform)\$(Configuration)\winuae_msvc.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Level3 - true - StdCall - Default - 4996;%(DisableSpecificWarnings) - %(ForcedIncludeFiles) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;wntab32x.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;%(AdditionalDependencies) - NotSet - $(OutDir)$(TargetName)$(TargetExt) - true - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - LIBCMT;%(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs) - true - $(Platform)\$(Configuration)\winuae.pdb - Windows - 0 - 0 - true - true - UseLinkTimeCodeGeneration - true - false - true - MachineX64 - - - ..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles) - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - - - - - true - true - true - Document - - - true - true - true - Document - - - true - true - true - Document - - - true - true - true - Document - - - true - true - true - Document - - - true - true - true - Document - - - - - - - - - \ No newline at end of file diff --git a/od-win32/winuae_msvc10/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc10/winuae_msvc.vcxproj.filters deleted file mode 100644 index 4184b353..00000000 --- a/od-win32/winuae_msvc10/winuae_msvc.vcxproj.filters +++ /dev/null @@ -1,748 +0,0 @@ - - - - - {86cfeeb5-a9b0-4c06-bd94-69c258884a66} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {5c4c971a-37b6-4c1e-82f1-d225ebb12808} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - {c0e78831-47fa-48a0-a34e-8c3c4410c34b} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {e76a708a-933c-4af4-bad2-0820d79b6a78} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {dab2f6c7-d741-4002-b0c9-566a1536642a} - - - {a88602d5-1980-49b2-a87a-79afa3ca7346} - - - {6b855260-58da-4be4-b914-621ca2e33ca5} - - - {1af2c9da-63ab-4226-8b97-5544a0a34433} - - - {99d2fcb7-e014-45fe-a543-4a9b9242a35b} - - - {d2f2439b-d15d-47d5-bb26-1a9436aef770} - - - {d69b4a6c-84db-480b-8b80-60a2a3646f6e} - - - {93fcf20a-8921-43e8-b4b9-e5fceb81332d} - - - {67d1b86d-3ebd-40fe-9fc2-c749eb7a890b} - - - {04629b2c-8cce-42aa-a9a7-e000e87ad1c2} - - - {736531a2-213e-4aef-ab15-c2a3a0025147} - - - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - jit - - - jit - - - jit - - - jit - - - prowizard - - - win32 - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lzx - - - unpackers\wrp - - - unpackers\zip - - - common - - - win32 - - - win32 - - - common - - - common - - - win32 - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - common - - - common - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - qemu - - - qemu - - - qemu - - - common - - - common - - - common - - - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - - - - - - - - win32\Resource Files - - - - - - - - - - - - - - \ No newline at end of file diff --git a/od-win32/winuae_msvc11/winuae.idc b/od-win32/winuae_msvc11/winuae.idc deleted file mode 100644 index 428a2ec7..00000000 --- a/od-win32/winuae_msvc11/winuae.idc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/od-win32/winuae_msvc11/winuae_msvc.sln b/od-win32/winuae_msvc11/winuae_msvc.sln deleted file mode 100644 index 32b37f7c..00000000 --- a/od-win32/winuae_msvc11/winuae_msvc.sln +++ /dev/null @@ -1,311 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40418.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winuae", "winuae_msvc.vcxproj", "{4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build68k", "..\build68k_msvc\build68k_msvc.vcxproj", "{AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genblitter", "..\genblitter_msvc\genblitter_msvc.vcxproj", "{765B0AF0-B8D3-4998-89AF-D6F939E1CD18}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencomp", "..\gencomp_msvc\gencomp_msvc.vcxproj", "{54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencpu", "..\gencpu_msvc\gencpu_msvc.vcxproj", "{DEF7ACF7-050E-4069-BB99-5B5D93F60521}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genlinetoscr", "..\genlinetoscr_msvc\genlinetoscr_msvc.vcxproj", "{E9F73E11-A463-45C6-A733-2BED75852BA1}" -EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "wix", "..\wix\wix.wixproj", "{BE211CE1-3955-4674-A664-5038FC791980}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resourcedll", "..\resourcedll\resourcedll.vcxproj", "{C85288FB-A035-42CA-B5FB-8E6214319E97}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - FullRelease|Mixed Platforms = FullRelease|Mixed Platforms - FullRelease|Win32 = FullRelease|Win32 - FullRelease|x64 = FullRelease|x64 - FullRelease|x86 = FullRelease|x86 - Release|Mixed Platforms = Release|Mixed Platforms - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - Test|Mixed Platforms = Test|Mixed Platforms - Test|Win32 = Test|Win32 - Test|x64 = Test|x64 - Test|x86 = Test|x86 - TestRelease|Mixed Platforms = TestRelease|Mixed Platforms - TestRelease|Win32 = TestRelease|Win32 - TestRelease|x64 = TestRelease|x64 - TestRelease|x86 = TestRelease|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Win32.ActiveCfg = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Win32.Build.0 = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x64.ActiveCfg = Debug|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x64.Build.0 = Debug|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x86.ActiveCfg = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x86.Build.0 = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Win32.Build.0 = FullRelease|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x64.ActiveCfg = FullRelease|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x64.Build.0 = FullRelease|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x86.Build.0 = FullRelease|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Mixed Platforms.Build.0 = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Win32.ActiveCfg = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Win32.Build.0 = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.ActiveCfg = Release|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.Build.0 = Release|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x86.ActiveCfg = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x86.Build.0 = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Mixed Platforms.ActiveCfg = Test|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Mixed Platforms.Build.0 = Test|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Win32.ActiveCfg = Test|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Win32.Build.0 = Test|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x64.ActiveCfg = Test|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x64.Build.0 = Test|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x86.ActiveCfg = Test|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x86.Build.0 = Test|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|Mixed Platforms.ActiveCfg = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|Mixed Platforms.Build.0 = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|Win32.ActiveCfg = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|Win32.Build.0 = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|x64.ActiveCfg = Release|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|x64.Build.0 = Release|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|x86.ActiveCfg = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|x86.Build.0 = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Win32.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Win32.Build.0 = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x64.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x86.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x86.Build.0 = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|x86.Build.0 = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Win32.ActiveCfg = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x64.ActiveCfg = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x86.ActiveCfg = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x86.Build.0 = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Mixed Platforms.ActiveCfg = Test|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Mixed Platforms.Build.0 = Test|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Win32.ActiveCfg = Test|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|x64.ActiveCfg = Test|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|x86.ActiveCfg = Test|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|x86.Build.0 = Test|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|Mixed Platforms.ActiveCfg = TestRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|Mixed Platforms.Build.0 = TestRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|Win32.ActiveCfg = TestRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|Win32.Build.0 = TestRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|x64.ActiveCfg = TestRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|x86.ActiveCfg = TestRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|x86.Build.0 = TestRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Win32.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Win32.Build.0 = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x64.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x86.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x86.Build.0 = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|x86.Build.0 = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Win32.ActiveCfg = Release|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x64.ActiveCfg = Release|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x86.ActiveCfg = Release|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x86.Build.0 = Release|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Mixed Platforms.ActiveCfg = Test|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Mixed Platforms.Build.0 = Test|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Win32.ActiveCfg = Test|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|x64.ActiveCfg = Test|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|x86.ActiveCfg = Test|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|x86.Build.0 = Test|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|Mixed Platforms.ActiveCfg = TestRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|Mixed Platforms.Build.0 = TestRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|Win32.ActiveCfg = TestRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|Win32.Build.0 = TestRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|x64.ActiveCfg = TestRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|x86.ActiveCfg = TestRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|x86.Build.0 = TestRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Win32.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Win32.Build.0 = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x64.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x86.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x86.Build.0 = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|x86.Build.0 = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Win32.ActiveCfg = Release|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x64.ActiveCfg = Release|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x86.ActiveCfg = Release|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x86.Build.0 = Release|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Mixed Platforms.ActiveCfg = Test|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Mixed Platforms.Build.0 = Test|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Win32.ActiveCfg = Test|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|x64.ActiveCfg = Test|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|x86.ActiveCfg = Test|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|x86.Build.0 = Test|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|Mixed Platforms.ActiveCfg = TestRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|Mixed Platforms.Build.0 = TestRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|Win32.ActiveCfg = TestRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|Win32.Build.0 = TestRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|x64.ActiveCfg = TestRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|x86.ActiveCfg = TestRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|x86.Build.0 = TestRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Win32.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Win32.Build.0 = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x64.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x86.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x86.Build.0 = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|x86.Build.0 = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Win32.ActiveCfg = Release|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x64.ActiveCfg = Release|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x86.ActiveCfg = Release|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x86.Build.0 = Release|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Mixed Platforms.ActiveCfg = Test|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Mixed Platforms.Build.0 = Test|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Win32.ActiveCfg = Test|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|x64.ActiveCfg = Test|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|x86.ActiveCfg = Test|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|x86.Build.0 = Test|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|Mixed Platforms.ActiveCfg = TestRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|Mixed Platforms.Build.0 = TestRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|Win32.ActiveCfg = TestRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|Win32.Build.0 = TestRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|x64.ActiveCfg = TestRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|x86.ActiveCfg = TestRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|x86.Build.0 = TestRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Win32.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Win32.Build.0 = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x64.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x86.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x86.Build.0 = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|x86.Build.0 = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Win32.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x64.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x86.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x86.Build.0 = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Mixed Platforms.ActiveCfg = Test|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Mixed Platforms.Build.0 = Test|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Win32.ActiveCfg = Test|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|x64.ActiveCfg = Test|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|x86.ActiveCfg = Test|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|x86.Build.0 = Test|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|Mixed Platforms.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|Mixed Platforms.Build.0 = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|Win32.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|Win32.Build.0 = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|x64.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|x86.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|x86.Build.0 = Release|Win32 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Win32.ActiveCfg = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Win32.Build.0 = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|x64.ActiveCfg = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|x86.ActiveCfg = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|x86.Build.0 = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|Mixed Platforms.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|Mixed Platforms.Build.0 = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|Win32.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|x64.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|x86.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|x86.Build.0 = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Release|Win32.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Release|x64.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Release|x86.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Release|x86.Build.0 = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Test|Mixed Platforms.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Test|Mixed Platforms.Build.0 = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Test|Win32.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Test|x64.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Test|x86.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Test|x86.Build.0 = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|Mixed Platforms.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|Mixed Platforms.Build.0 = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|Win32.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|Win32.Build.0 = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|x64.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|x86.ActiveCfg = Release|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|x86.Build.0 = Release|x86 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Win32.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Win32.Build.0 = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x64.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x86.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x86.Build.0 = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Win32.Build.0 = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|x86.ActiveCfg = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|x86.Build.0 = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Mixed Platforms.Build.0 = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Win32.ActiveCfg = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Win32.Build.0 = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x64.ActiveCfg = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x86.ActiveCfg = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x86.Build.0 = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Mixed Platforms.ActiveCfg = Test|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Mixed Platforms.Build.0 = Test|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Win32.ActiveCfg = Test|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Win32.Build.0 = Test|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|x64.ActiveCfg = Test|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|x86.ActiveCfg = Test|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|x86.Build.0 = Test|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|Mixed Platforms.ActiveCfg = TestRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|Mixed Platforms.Build.0 = TestRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|Win32.ActiveCfg = TestRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|Win32.Build.0 = TestRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|x64.ActiveCfg = TestRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|x86.ActiveCfg = TestRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|x86.Build.0 = TestRelease|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/od-win32/winuae_msvc11/winuae_msvc.vcxproj b/od-win32/winuae_msvc11/winuae_msvc.vcxproj deleted file mode 100644 index 80eb2ebd..00000000 --- a/od-win32/winuae_msvc11/winuae_msvc.vcxproj +++ /dev/null @@ -1,1082 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - FullRelease - Win32 - - - FullRelease - x64 - - - Release - Win32 - - - Release - x64 - - - Test - Win32 - - - Test - x64 - - - - winuae - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA} - winuae - - - - Application - false - Unicode - true - v120_xp - - - Application - false - Unicode - v120_xp - - - Application - false - Unicode - v120_xp - - - Application - false - Unicode - v120 - - - Application - false - Unicode - true - v120 - - - Application - false - Unicode - v120 - - - Application - false - Unicode - v120 - - - Application - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - d:\amiga\ - $(Configuration)\ - true - true - d:\amiga\ - $(Platform)\$(Configuration)\ - true - true - d:\amiga\ - d:\amiga\ - $(Configuration)\ - $(Configuration)\ - false - false - d:\amiga\ - d:\amiga\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - false - true - true - d:\amiga\ - $(Configuration)\ - false - true - d:\amiga\ - $(Platform)\$(Configuration)\ - false - true - winuae64 - winuae64 - winuae64 - winuae64 - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;C:\dev\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;C:\dev\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;C:\dev\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - $(ReferencePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;$(LibraryPath) - true - true - true - true - C:\dev\include;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath) - C:\dev\lib\x64;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\lib\x64;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\lib\x64;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\lib\x64;$(LibraryPath) - - - false - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/winuae_msvc.tlb - - - %(AdditionalOptions) - Disabled - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0601;_DEBUG;WIN32_IE=0x0700;WIN32;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;UAE;WINUAE;%(PreprocessorDefinitions) - false - false - false - Sync - EnableFastChecks - MultiThreadedDebug - true - false - .\Debug/winuae_msvc.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - FastCall - Default - 4996;%(DisableSpecificWarnings) - false - false - %(ForcedIncludeFiles) - true - Disabled - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9d.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;prowizard.lib;lzmalib.lib;libFLAC_static.lib;Avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) - NotSet - $(OutDir)$(TargetName)$(TargetExt) - true - LIBCMT;%(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs) - true - .\Debug/winuae.pdb - Windows - 2621440 - 2621440 - true - false - - - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - - - false - - - ../resources/winuae.exe.manifest - true - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/winuae_msvc.tlb - - - %(AdditionalOptions) - Disabled - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0601;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebug - true - false - $(Platform)\$(Configuration)\winuae_msvc.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Level3 - true - ProgramDatabase - FastCall - Default - 4996;%(DisableSpecificWarnings) - false - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - LIBCMT;%(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;Dwmapi.lib;%(DelayLoadDLLs) - true - $(Platform)\$(Configuration)\winuae.pdb - Windows - 2621440 - 2621440 - true - false - true - MachineX64 - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - - - - - ..\resources\winuae64.exe.manifest - true - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/winuae_msvc.tlb - - - Full - AnySuitable - true - Speed - true - false - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;:%(AdditionalIncludeDirectories) - WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) - true - Sync - Default - MultiThreaded - false - true - NoExtensions - Precise - false - false - - - .\Release/winuae_msvc.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - FastCall - Default - 4996;%(DisableSpecificWarnings) - %(ForcedIncludeFiles) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;libFLAC_static.lib;Avrt.lib;hid.lib;zlibstat.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - %(AdditionalManifestDependencies) - %(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs) - true - .\Release/winuae.pdb - Windows - 2621440 - 2621440 - true - true - true - - - true - false - true - MachineX86 - 5.01 - - - - - ../resources/winuae.exe.manifest - true - $(IntDir)$(TargetName)$(TargetExt).embed.manifest - /validate_manifest %(AdditionalOptions) - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/winuae_msvc.tlb - - - Disabled - Disabled - true - Neither - false - false - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0601;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) - true - Sync - Default - MultiThreaded - false - true - NotSet - Precise - false - false - - - .\Test/winuae_msvc.pch - .\Test/ - .\Test/ - .\Test/ - Level3 - true - FastCall - Default - 4996;%(DisableSpecificWarnings) - %(ForcedIncludeFiles) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;libFLAC_static.lib;Avrt.lib;hid.lib;zlibstat.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - %(AdditionalManifestDependencies) - %(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs) - true - .\Test/winuae.pdb - Windows - 2621440 - 2621440 - true - true - true - - - true - false - true - MachineX86 - 5.01 - - - - - ../resources/winuae.exe.manifest - true - $(IntDir)$(TargetName)$(TargetExt).embed.manifest - /validate_manifest %(AdditionalOptions) - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/winuae_msvc.tlb - - - Full - OnlyExplicitInline - true - Speed - true - false - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) - true - Sync - Default - MultiThreadedDLL - false - true - NotSet - Precise - false - false - NotUsing - $(Platform)\$(Configuration)/winuae_msvc.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Level3 - true - FastCall - Default - 4996;%(DisableSpecificWarnings) - %(ForcedIncludeFiles) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) - NotSet - $(OutDir)$(TargetName)$(TargetExt) - true - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - %(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;Dwmapi.dll;Iphlpapi.dll;%(DelayLoadDLLs) - true - $(Platform)\$(Configuration)\winuae.pdb - Windows - 0 - 0 - true - true - - - true - false - true - MachineX64 - true - - - ..\resources\winuae64.exe.manifest - true - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/winuae_msvc.tlb - - - Disabled - OnlyExplicitInline - true - Neither - false - false - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) - true - Sync - Default - MultiThreadedDLL - false - false - NotSet - Precise - false - false - NotUsing - $(Platform)\$(Configuration)/winuae_msvc.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Level3 - true - FastCall - Default - 4996;%(DisableSpecificWarnings) - %(ForcedIncludeFiles) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) - NotSet - $(OutDir)$(TargetName)$(TargetExt) - true - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - %(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;Dwmapi.lib;%(DelayLoadDLLs) - true - $(Platform)\$(Configuration)\winuae.pdb - Windows - 0 - 0 - true - true - - - false - false - true - MachineX64 - - - ..\resources\winuae64.exe.manifest - true - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/winuae_msvc.tlb - - - Full - AnySuitable - true - Speed - true - true - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) - true - Sync - Default - MultiThreaded - false - true - NoExtensions - Precise - false - false - - - .\FullRelease/winuae_msvc.pch - .\FullRelease/ - .\FullRelease/ - .\FullRelease/ - Level3 - true - FastCall - Default - 4996;%(DisableSpecificWarnings) - %(ForcedIncludeFiles) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;avrt.lib;enet.lib;prowizard.lib;lzmalib.lib;libFLAC_static.lib;Avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - %(AdditionalManifestDependencies) - %(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs) - true - .\FullRelease/winuae.pdb - Windows - 2621440 - 2621440 - true - true - false - UseLinkTimeCodeGeneration - true - false - true - MachineX86 - 5.01 - false - true - - - ../resources/winuae.exe.manifest - true - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/winuae_msvc.tlb - - - Full - AnySuitable - true - Speed - true - true - ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) - true - Sync - Default - MultiThreadedDLL - false - true - NotSet - Precise - false - false - - - $(Platform)\$(Configuration)\winuae_msvc.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Level3 - true - FastCall - Default - 4996;%(DisableSpecificWarnings) - %(ForcedIncludeFiles) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) - NotSet - $(OutDir)$(TargetName)$(TargetExt) - true - %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - %(IgnoreSpecificDefaultLibraries) - wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs) - true - .\x64\FullRelease/winuae.pdb - Windows - 0 - 0 - true - true - UseLinkTimeCodeGeneration - true - false - true - MachineX64 - - - ..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles) - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - - - - - true - true - true - true - Document - - - true - true - true - true - Document - - - true - true - true - true - Document - - - true - true - true - true - Document - - - true - true - true - true - Document - - - true - true - true - true - Document - - - - - - - - - \ No newline at end of file diff --git a/od-win32/winuae_msvc11/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc11/winuae_msvc.vcxproj.filters deleted file mode 100644 index 9a9d9bfe..00000000 --- a/od-win32/winuae_msvc11/winuae_msvc.vcxproj.filters +++ /dev/null @@ -1,856 +0,0 @@ - - - - - {86cfeeb5-a9b0-4c06-bd94-69c258884a66} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {5c4c971a-37b6-4c1e-82f1-d225ebb12808} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - {c0e78831-47fa-48a0-a34e-8c3c4410c34b} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {e76a708a-933c-4af4-bad2-0820d79b6a78} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {dab2f6c7-d741-4002-b0c9-566a1536642a} - - - {a88602d5-1980-49b2-a87a-79afa3ca7346} - - - {6b855260-58da-4be4-b914-621ca2e33ca5} - - - {1af2c9da-63ab-4226-8b97-5544a0a34433} - - - {99d2fcb7-e014-45fe-a543-4a9b9242a35b} - - - {d2f2439b-d15d-47d5-bb26-1a9436aef770} - - - {d69b4a6c-84db-480b-8b80-60a2a3646f6e} - - - {93fcf20a-8921-43e8-b4b9-e5fceb81332d} - - - {dd8bf794-572a-4d08-9cae-b280eb493e54} - - - {7abef0b5-1d8e-4f43-baa6-ff61760bc330} - - - {fc42f311-daf2-48de-a851-8ad3a4aad22e} - - - {61d78a16-0513-4885-b23d-534829071ac0} - - - {a238ed36-3d5f-4fd0-afd7-a34029119da7} - - - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - win32 - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - jit - - - jit - - - jit - - - jit - - - prowizard - - - win32 - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\dms - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lha - - - unpackers\lzx - - - unpackers\wrp - - - unpackers\zip - - - common - - - win32 - - - win32 - - - common - - - common - - - win32 - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - common - - - common - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - slirp - - - qemu - - - qemu - - - qemu - - - common - - - common - - - common - - - common - - - qemu - - - common - - - common - - - common - - - unpackers\mp2 - - - common - - - common - - - win32 - - - win32 - - - common - - - common - - - qemu - - - common - - - qemu - - - ppc - - - common - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - unpackers\chd - - - ppc - - - common - - - common - - - common - - - qemu - - - common - - - common - - - common - - - common - - - common - - - common - - - unpackers\zip - - - unpackers\zip - - - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - win32\Resource Files - - - - - - - - - - win32\Resource Files - - - - - - - - - - - - - - \ No newline at end of file diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 8fecd686..060e3087 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,34 @@ +Beta 13: + +- HALT10 was incorrectly triggered in some configurations (b12) +- Update ExecBase.MaxLocMem (and ChkSum) if more than 2M chip RAM is configured. +- It was not possible to fully disable enabled expansion device without restart. Checkbox was unticked but + device was not fully disabled. +- Copper COPJMP blitter conflict bug emulation is again disabled (Breaks Batman Vuelve / Batman Group). + There is still something unknown. I did some more tests and some blitter cycle sequences do not conflict + with buggy copper cycle and correctly wait one extra cycle. +- Added IVS Trumpcard Pro/GrandSlam SCSI v4.9 ROM image. Emulation not yet implemented. + "Trumpcard Professional Driver 4.9 - devs/IVS_SCSIpro.driver IVSSCSI 4.9 (20 Sep 1991)"' + +Variable Refresh rate updates. I finally bought G-Sync monitor, Acer Predator X34. Every emulator +(any emulator!) user should get G-Sync or FreeSync hardware because variable sync has all the advantages of +vsync without any vsync disadvantages!) + +- Adaptive Sync renamed to Variable Sync. Adaptive Sync is name of DP variable refresh rate standard (which + AMD's FreeSync is based on). "Official" generic name is Variable Refresh Rates but Variable Sync fits + better with other VSync modes in GUI. +- Variable sync + black frame insertion is now supported in windowed and full-window mode. + (I couldn't get G-Sync to work in normal windowed mode but it did work in full-window) +- Variable sync + black frame insertion is now supported in RTG modes. +- Black frame insertion is not enabled in variable sync mode if refresh rate would become larger than + selected display refresh rate (fullscreen) or desktop refresh rate (windowed/full-window). +- Variable sync + black frame insertion and if doubled refresh rate is equal to selected/max hardware + supported refresh rate: automatically reduce internal emulated refresh rate by 0.5Hz to guarantee + glitch free display. (Workaround for monitors that have max refresh rate of 100Hz=PAL or 120Hz=NTSC) + +Continuation to offtopic PC story: returned it on monday, replacement arrived on wednesday. + Beta 12: - Dummy 68030 MMU instructions were also accidentally disabled in "generic" 680x0 core. (b11) diff --git a/scsi.cpp b/scsi.cpp index 58a2d126..cc015e06 100644 --- a/scsi.cpp +++ b/scsi.cpp @@ -25,7 +25,7 @@ #include "cia.h" #define SCSI_EMU_DEBUG 0 -#define RAW_SCSI_DEBUG 1 +#define RAW_SCSI_DEBUG 0 #define NCR5380_DEBUG 0 #define NCR5380_DEBUG_IRQ 0 @@ -1086,7 +1086,9 @@ static uae_u8 raw_scsi_get_data_2(struct raw_scsi *rs, bool next, bool nodebug) write_log(_T("raw_scsi: read data byte %02x (%d/%d)\n"), v, sd->offset, sd->data_len); #endif if (scsi_receive_data(sd, &v, next)) { +#if RAW_SCSI_DEBUG write_log(_T("raw_scsi: data in finished, %d bytes: status phase\n"), sd->offset); +#endif rs->bus_phase = SCSI_SIGNAL_PHASE_STATUS; } break;