OSDN Git Service

[General] Merge Updtream 2017-03-15 . Still not build all of VMs.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 17 Mar 2017 05:49:57 +0000 (14:49 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 17 Mar 2017 05:49:57 +0000 (14:49 +0900)
commit5f6cf75c70fc5720b528fb655988b7b863700614
tree742acb46ec263bbe5d2ffb6ca08b396ec4a42f02
parent69c1dfe417c2f52cbc25730d2131f39c3bcac16f
[General] Merge Updtream 2017-03-15 . Still not build all of VMs.
436 files changed:
source/history.txt
source/readme.txt
source/src/emu.cpp
source/src/emu.h
source/src/qt/CMakeLists.txt
source/src/qt/common/emu_thread.cpp
source/src/qt/common/menu_flags.cpp
source/src/qt/gui/CMakeLists.txt
source/src/qt/gui/menu_flags.h
source/src/qt/gui/menu_flags_tmpl.cpp
source/src/res/babbage2nd.rc
source/src/res/ex80.rc
source/src/res/fm16pi.rc
source/src/res/fm7.rc
source/src/res/fm77.rc
source/src/res/fm77av.rc
source/src/res/fm77av40.rc
source/src/res/fm77av40ex.rc
source/src/res/fm8.rc
source/src/res/fmr30.rc
source/src/res/fmr50_i286.rc
source/src/res/fmr50_i386.rc
source/src/res/fmr50_i486.rc
source/src/res/fmr60.rc
source/src/res/fmr70.rc
source/src/res/fmr80.rc
source/src/res/fp1100.rc
source/src/res/gamegear.rc
source/src/res/hc20.rc
source/src/res/hc40.rc
source/src/res/hc80.rc
source/src/res/hx20.rc
source/src/res/icon.txt
source/src/res/indicator/access_off.bmp [new file with mode: 0644]
source/src/res/indicator/access_on.bmp [new file with mode: 0644]
source/src/res/j3100.rc
source/src/res/jr800.rc [new file with mode: 0644]
source/src/res/jx.rc
source/src/res/msx1.rc
source/src/res/msx2.rc
source/src/res/msx2p.rc
source/src/res/multi8.rc
source/src/res/mz1200.rc
source/src/res/mz1500.rc
source/src/res/mz2200.rc
source/src/res/mz2500.rc
source/src/res/mz2800.rc
source/src/res/mz3500.rc
source/src/res/mz5500.rc
source/src/res/mz6500.rc
source/src/res/mz6550.rc
source/src/res/mz800.rc
source/src/res/mz80a.rc
source/src/res/mz80b.rc
source/src/res/mz80k.rc
source/src/res/n5200.rc
source/src/res/pasopia.rc
source/src/res/pasopia7.rc
source/src/res/pasopia7lcd.rc
source/src/res/pc100.rc
source/src/res/pc6001.rc
source/src/res/pc6001mk2.rc
source/src/res/pc6001mk2sr.rc
source/src/res/pc6601.rc
source/src/res/pc6601sr.rc
source/src/res/pc8001mk2sr.rc
source/src/res/pc8801ma.rc
source/src/res/pc9801.rc
source/src/res/pc9801e.rc
source/src/res/pc9801u.rc
source/src/res/pc9801vf.rc
source/src/res/pc9801vm.rc
source/src/res/pc98do.rc
source/src/res/pc98ha.rc
source/src/res/pc98lt.rc
source/src/res/pcengine.rc
source/src/res/px7.rc
source/src/res/qc10.rc
source/src/res/qc10cms.rc
source/src/res/resource.h
source/src/res/sc3000.rc
source/src/res/smb80te.rc
source/src/res/smc70.rc
source/src/res/smc777.rc
source/src/res/tk80bs.rc
source/src/res/tk85.rc
source/src/res/x1.rc
source/src/res/x1turbo.rc
source/src/res/x1turboz.rc
source/src/res/x1twin.rc
source/src/res/ys6464a.rc
source/src/vm/bmjr/bmjr.cpp
source/src/vm/bmjr/bmjr.h
source/src/vm/datarec.cpp
source/src/vm/datarec.h
source/src/vm/familybasic/familybasic.cpp
source/src/vm/familybasic/familybasic.h
source/src/vm/fm16pi/fm16pi.cpp
source/src/vm/fm16pi/fm16pi.h
source/src/vm/fm7/fm7.cpp
source/src/vm/fm7/fm7.h
source/src/vm/fmr30/fmr30.cpp
source/src/vm/fmr30/fmr30.h
source/src/vm/fmr50/bios.cpp
source/src/vm/fmr50/bios.h
source/src/vm/fmr50/fmr50.cpp
source/src/vm/fmr50/fmr50.h
source/src/vm/fmtowns/fmtowns.cpp
source/src/vm/fmtowns/fmtowns.h
source/src/vm/fp1100/fp1100.cpp
source/src/vm/fp1100/fp1100.h
source/src/vm/fp200/fp200.cpp
source/src/vm/fp200/fp200.h
source/src/vm/gamegear/gamegear.cpp
source/src/vm/gamegear/gamegear.h
source/src/vm/gamegear/mastersystem.cpp
source/src/vm/gamegear/mastersystem.h
source/src/vm/hc20/hc20.cpp
source/src/vm/hc20/hc20.h
source/src/vm/hc40/hc40.cpp
source/src/vm/hc40/hc40.h
source/src/vm/hc80/hc80.cpp
source/src/vm/hc80/hc80.h
source/src/vm/hd44102.cpp
source/src/vm/hd44102.h
source/src/vm/j3100/j3100.cpp
source/src/vm/j3100/j3100.h
source/src/vm/jr100/jr100.cpp
source/src/vm/jr100/jr100.h
source/src/vm/jr800/io.cpp [new file with mode: 0644]
source/src/vm/jr800/io.h [new file with mode: 0644]
source/src/vm/jr800/jr800.cpp [new file with mode: 0644]
source/src/vm/jr800/jr800.h [new file with mode: 0644]
source/src/vm/jx/jx.cpp
source/src/vm/jx/jx.h
source/src/vm/ld700.cpp
source/src/vm/ld700.h
source/src/vm/m5/m5.cpp
source/src/vm/m5/m5.h
source/src/vm/mc6800.cpp
source/src/vm/msx/memory.cpp
source/src/vm/msx/memory.h
source/src/vm/msx/memory_ex.cpp
source/src/vm/msx/memory_ex.h
source/src/vm/msx/msx.cpp
source/src/vm/msx/msx.h
source/src/vm/msx/msx_ex.cpp
source/src/vm/msx/msx_ex.h
source/src/vm/multi8/multi8.cpp
source/src/vm/multi8/multi8.h
source/src/vm/mycomz80a/mycomz80a.cpp
source/src/vm/mycomz80a/mycomz80a.h
source/src/vm/mz2500/mz1e30.cpp
source/src/vm/mz2500/mz2500.cpp
source/src/vm/mz2500/mz2500.h
source/src/vm/mz2500/mz80b.cpp
source/src/vm/mz2500/mz80b.h
source/src/vm/mz2800/mz2800.cpp
source/src/vm/mz2800/mz2800.h
source/src/vm/mz3500/mz3500.cpp
source/src/vm/mz3500/mz3500.h
source/src/vm/mz5500/mz5500.cpp
source/src/vm/mz5500/mz5500.h
source/src/vm/mz700/mz700.cpp
source/src/vm/mz700/mz700.h
source/src/vm/mz80k/mz80k.cpp
source/src/vm/mz80k/mz80k.h
source/src/vm/n5200/n5200.cpp
source/src/vm/n5200/n5200.h
source/src/vm/pasopia/pasopia.cpp
source/src/vm/pasopia/pasopia.h
source/src/vm/pasopia7/pasopia7.cpp
source/src/vm/pasopia7/pasopia7.h
source/src/vm/pc100/pc100.cpp
source/src/vm/pc100/pc100.h
source/src/vm/pc2001/pc2001.cpp
source/src/vm/pc2001/pc2001.h
source/src/vm/pc6001/pc6001.cpp
source/src/vm/pc6001/pc6001.h
source/src/vm/pc8201/pc8201.cpp
source/src/vm/pc8201/pc8201.h
source/src/vm/pc8801/pc8801.cpp
source/src/vm/pc8801/pc8801.h
source/src/vm/pc9801/pc9801.cpp
source/src/vm/pc9801/pc9801.h
source/src/vm/pc98ha/pc98ha.cpp
source/src/vm/pc98ha/pc98ha.h
source/src/vm/pcengine/pcengine.cpp
source/src/vm/pcengine/pcengine.h
source/src/vm/phc20/phc20.cpp
source/src/vm/phc20/phc20.h
source/src/vm/phc25/phc25.cpp
source/src/vm/phc25/phc25.h
source/src/vm/pyuta/pyuta.cpp
source/src/vm/pyuta/pyuta.h
source/src/vm/qc10/qc10.cpp
source/src/vm/qc10/qc10.h
source/src/vm/rx78/rx78.cpp
source/src/vm/rx78/rx78.h
source/src/vm/sc3000/sc3000.cpp
source/src/vm/sc3000/sc3000.h
source/src/vm/scsi_cdrom.cpp
source/src/vm/scsi_dev.cpp
source/src/vm/scsi_dev.h
source/src/vm/scsi_hdd.cpp
source/src/vm/smb80te/smb80te.cpp
source/src/vm/smb80te/smb80te.h
source/src/vm/smc777/smc777.cpp
source/src/vm/smc777/smc777.h
source/src/vm/tk80bs/tk80bs.cpp
source/src/vm/tk80bs/tk80bs.h
source/src/vm/x1/x1.cpp
source/src/vm/x1/x1.h
source/src/vm/yalky/yalky.cpp
source/src/vm/yalky/yalky.h
source/src/win32/osd.h
source/src/win32/osd_screen.cpp
source/src/win32/winmain.cpp
source/vc++2008/build9.bat
source/vc++2008/fm16pi.vcproj
source/vc++2008/fm7.vcproj
source/vc++2008/fm77.vcproj
source/vc++2008/fm77av.vcproj
source/vc++2008/fm77av40.vcproj
source/vc++2008/fm77av40ex.vcproj
source/vc++2008/fm8.vcproj
source/vc++2008/fmr30_i286.vcproj
source/vc++2008/fmr30_i86.vcproj
source/vc++2008/fmr50_i286.vcproj
source/vc++2008/fmr50_i386.vcproj
source/vc++2008/fmr50_i486.vcproj
source/vc++2008/fmr60.vcproj
source/vc++2008/fmr70.vcproj
source/vc++2008/fmr80.vcproj
source/vc++2008/fp1100.vcproj
source/vc++2008/gamegear.vcproj
source/vc++2008/hc20.vcproj
source/vc++2008/hc40.vcproj
source/vc++2008/hc80.vcproj
source/vc++2008/hx20.vcproj
source/vc++2008/j3100gt.vcproj
source/vc++2008/j3100sl.vcproj
source/vc++2008/jr800.vcproj [new file with mode: 0644]
source/vc++2008/jx.vcproj
source/vc++2008/msx1.vcproj
source/vc++2008/msx2.vcproj
source/vc++2008/msx2p.vcproj
source/vc++2008/multi8.vcproj
source/vc++2008/mz1200.vcproj
source/vc++2008/mz1500.vcproj
source/vc++2008/mz2200.vcproj
source/vc++2008/mz2500.vcproj
source/vc++2008/mz2800.vcproj
source/vc++2008/mz3500.vcproj
source/vc++2008/mz5500.vcproj
source/vc++2008/mz6500.vcproj
source/vc++2008/mz6550.vcproj
source/vc++2008/mz800.vcproj
source/vc++2008/mz80a.vcproj
source/vc++2008/mz80b.vcproj
source/vc++2008/mz80k.vcproj
source/vc++2008/n5200.vcproj
source/vc++2008/pasopia.vcproj
source/vc++2008/pasopia7.vcproj
source/vc++2008/pasopia7lcd.vcproj
source/vc++2008/pc100.vcproj
source/vc++2008/pc6001.vcproj
source/vc++2008/pc6001mk2.vcproj
source/vc++2008/pc6001mk2sr.vcproj
source/vc++2008/pc6601.vcproj
source/vc++2008/pc6601sr.vcproj
source/vc++2008/pc8001mk2sr.vcproj
source/vc++2008/pc8801ma.vcproj
source/vc++2008/pc9801.vcproj
source/vc++2008/pc9801e.vcproj
source/vc++2008/pc9801u.vcproj
source/vc++2008/pc9801vf.vcproj
source/vc++2008/pc9801vm.vcproj
source/vc++2008/pc98do.vcproj
source/vc++2008/pc98ha.vcproj
source/vc++2008/pc98lt.vcproj
source/vc++2008/pcengine.vcproj
source/vc++2008/qc10.vcproj
source/vc++2008/qc10cms.vcproj
source/vc++2008/sc3000.vcproj
source/vc++2008/smc70.vcproj
source/vc++2008/smc777.vcproj
source/vc++2008/x1.vcproj
source/vc++2008/x1turbo.vcproj
source/vc++2008/x1turboz.vcproj
source/vc++2008/x1twin.vcproj
source/vc++2013/build12.bat
source/vc++2013/fm16pi.vcxproj
source/vc++2013/fm16pi.vcxproj.filters
source/vc++2013/fm7.vcxproj
source/vc++2013/fm7.vcxproj.filters
source/vc++2013/fm77.vcxproj
source/vc++2013/fm77.vcxproj.filters
source/vc++2013/fm77av.vcxproj
source/vc++2013/fm77av.vcxproj.filters
source/vc++2013/fm77av40.vcxproj
source/vc++2013/fm77av40.vcxproj.filters
source/vc++2013/fm77av40ex.vcxproj
source/vc++2013/fm77av40ex.vcxproj.filters
source/vc++2013/fm8.vcxproj
source/vc++2013/fm8.vcxproj.filters
source/vc++2013/fmr30_i286.vcxproj
source/vc++2013/fmr30_i286.vcxproj.filters
source/vc++2013/fmr30_i86.vcxproj
source/vc++2013/fmr30_i86.vcxproj.filters
source/vc++2013/fmr50_i286.vcxproj
source/vc++2013/fmr50_i286.vcxproj.filters
source/vc++2013/fmr50_i386.vcxproj
source/vc++2013/fmr50_i386.vcxproj.filters
source/vc++2013/fmr50_i486.vcxproj
source/vc++2013/fmr50_i486.vcxproj.filters
source/vc++2013/fmr60.vcxproj
source/vc++2013/fmr60.vcxproj.filters
source/vc++2013/fmr70.vcxproj
source/vc++2013/fmr70.vcxproj.filters
source/vc++2013/fmr80.vcxproj
source/vc++2013/fmr80.vcxproj.filters
source/vc++2013/fp1100.vcxproj
source/vc++2013/fp1100.vcxproj.filters
source/vc++2013/gamegear.vcxproj
source/vc++2013/gamegear.vcxproj.filters
source/vc++2013/hc20.vcxproj
source/vc++2013/hc20.vcxproj.filters
source/vc++2013/hc40.vcxproj
source/vc++2013/hc40.vcxproj.filters
source/vc++2013/hc80.vcxproj
source/vc++2013/hc80.vcxproj.filters
source/vc++2013/hx20.vcxproj
source/vc++2013/hx20.vcxproj.filters
source/vc++2013/j3100gt.vcxproj
source/vc++2013/j3100gt.vcxproj.filters
source/vc++2013/j3100sl.vcxproj
source/vc++2013/j3100sl.vcxproj.filters
source/vc++2013/jr800.vcxproj [new file with mode: 0644]
source/vc++2013/jr800.vcxproj.filters [new file with mode: 0644]
source/vc++2013/jx.vcxproj
source/vc++2013/jx.vcxproj.filters
source/vc++2013/msx1.vcxproj
source/vc++2013/msx1.vcxproj.filters
source/vc++2013/msx2.vcxproj
source/vc++2013/msx2.vcxproj.filters
source/vc++2013/msx2p.vcxproj
source/vc++2013/msx2p.vcxproj.filters
source/vc++2013/multi8.vcxproj
source/vc++2013/multi8.vcxproj.filters
source/vc++2013/mz1200.vcxproj
source/vc++2013/mz1200.vcxproj.filters
source/vc++2013/mz1500.vcxproj
source/vc++2013/mz1500.vcxproj.filters
source/vc++2013/mz2200.vcxproj
source/vc++2013/mz2200.vcxproj.filters
source/vc++2013/mz2500.vcxproj
source/vc++2013/mz2500.vcxproj.filters
source/vc++2013/mz2800.vcxproj
source/vc++2013/mz2800.vcxproj.filters
source/vc++2013/mz3500.vcxproj
source/vc++2013/mz3500.vcxproj.filters
source/vc++2013/mz5500.vcxproj
source/vc++2013/mz5500.vcxproj.filters
source/vc++2013/mz6500.vcxproj
source/vc++2013/mz6500.vcxproj.filters
source/vc++2013/mz6550.vcxproj
source/vc++2013/mz6550.vcxproj.filters
source/vc++2013/mz800.vcxproj
source/vc++2013/mz800.vcxproj.filters
source/vc++2013/mz80a.vcxproj
source/vc++2013/mz80a.vcxproj.filters
source/vc++2013/mz80b.vcxproj
source/vc++2013/mz80b.vcxproj.filters
source/vc++2013/mz80k.vcxproj
source/vc++2013/mz80k.vcxproj.filters
source/vc++2013/n5200.vcxproj
source/vc++2013/n5200.vcxproj.filters
source/vc++2013/pasopia.vcxproj
source/vc++2013/pasopia.vcxproj.filters
source/vc++2013/pasopia7.vcxproj
source/vc++2013/pasopia7.vcxproj.filters
source/vc++2013/pasopia7lcd.vcxproj
source/vc++2013/pasopia7lcd.vcxproj.filters
source/vc++2013/pc100.vcxproj
source/vc++2013/pc100.vcxproj.filters
source/vc++2013/pc6001.vcxproj
source/vc++2013/pc6001.vcxproj.filters
source/vc++2013/pc6001mk2.vcxproj
source/vc++2013/pc6001mk2.vcxproj.filters
source/vc++2013/pc6001mk2sr.vcxproj
source/vc++2013/pc6001mk2sr.vcxproj.filters
source/vc++2013/pc6601.vcxproj
source/vc++2013/pc6601.vcxproj.filters
source/vc++2013/pc6601sr.vcxproj
source/vc++2013/pc6601sr.vcxproj.filters
source/vc++2013/pc8001mk2sr.vcxproj
source/vc++2013/pc8001mk2sr.vcxproj.filters
source/vc++2013/pc8801ma.vcxproj
source/vc++2013/pc8801ma.vcxproj.filters
source/vc++2013/pc9801.vcxproj
source/vc++2013/pc9801.vcxproj.filters
source/vc++2013/pc9801e.vcxproj
source/vc++2013/pc9801e.vcxproj.filters
source/vc++2013/pc9801u.vcxproj
source/vc++2013/pc9801u.vcxproj.filters
source/vc++2013/pc9801vf.vcxproj
source/vc++2013/pc9801vf.vcxproj.filters
source/vc++2013/pc9801vm.vcxproj
source/vc++2013/pc9801vm.vcxproj.filters
source/vc++2013/pc98do.vcxproj
source/vc++2013/pc98do.vcxproj.filters
source/vc++2013/pc98ha.vcxproj
source/vc++2013/pc98ha.vcxproj.filters
source/vc++2013/pc98lt.vcxproj
source/vc++2013/pc98lt.vcxproj.filters
source/vc++2013/pcengine.vcxproj
source/vc++2013/pcengine.vcxproj.filters
source/vc++2013/qc10.vcxproj
source/vc++2013/qc10.vcxproj.filters
source/vc++2013/qc10cms.vcxproj
source/vc++2013/qc10cms.vcxproj.filters
source/vc++2013/sc3000.vcxproj
source/vc++2013/sc3000.vcxproj.filters
source/vc++2013/smc70.vcxproj
source/vc++2013/smc70.vcxproj.filters
source/vc++2013/smc777.vcxproj
source/vc++2013/smc777.vcxproj.filters
source/vc++2013/x1.vcxproj
source/vc++2013/x1.vcxproj.filters
source/vc++2013/x1turbo.vcxproj
source/vc++2013/x1turbo.vcxproj.filters
source/vc++2013/x1turboz.vcxproj
source/vc++2013/x1turboz.vcxproj.filters
source/vc++2013/x1twin.vcxproj
source/vc++2013/x1twin.vcxproj.filters