From 181f1f643ec75a9cef0856e1517ecb1bff9df457 Mon Sep 17 00:00:00 2001 From: Melissa Goad Date: Fri, 9 Dec 2016 16:36:48 -0600 Subject: [PATCH 1/2] Add CMake in preparation for MSVC builds --- src/CMakeLists.txt | 55 ++++++++++++++++++++++++++ src/CMakeModules/FindD3D9.cmake | 53 +++++++++++++++++++++++++ src/CMakeModules/FindDirectDraw.cmake | 53 +++++++++++++++++++++++++ src/CMakeModules/FindDirectInput.cmake | 53 +++++++++++++++++++++++++ 4 files changed, 214 insertions(+) create mode 100644 src/CMakeLists.txt create mode 100644 src/CMakeModules/FindD3D9.cmake create mode 100644 src/CMakeModules/FindDirectDraw.cmake create mode 100644 src/CMakeModules/FindDirectInput.cmake diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 000000000..1f756e1d6 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,55 @@ +cmake_minimum_required(VERSION 2.8.8) +project(86box) + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeModules) + +set(SRCS +386.c 386_dynarec.c 386_dynarec_ops.c 808x.c acer386sx.c acerm3a.c aha154x.c ali1429.c amstrad.c cdrom-ioctl.c cdrom-iso.c +cdrom-null.c codegen.c codegen_ops.c codegen_timing_486.c codegen_timing_686.c codegen_timing_pentium.c codegen_timing_winchip.c compaq.c config.c cpu.c dac.c +device.c disc.c disc_86f.c disc_fdi.c disc_imd.c disc_img.c disc_random.c disc_td0.c dma.c fdc.c fdc37c665.c fdc37c932fr.c fdd.c fdi2raw.c gameport.c headland.c i430hx.c i430lx.c i430fx.c +i430nx.c i430vx.c i440fx.c ide.c intel.c intel_flash.c io.c jim.c joystick_ch_flightstick_pro.c joystick_standard.c joystick_sw_pad.c joystick_tm_fcs.c keyboard.c keyboard_amstrad.c keyboard_at.c +keyboard_olim24.c keyboard_pcjr.c keyboard_xt.c lpt.c mcr.c mem.c memregs.c model.c mouse.c mouse_amstrad.c mouse_ps2.c +mouse_serial.c ne2000.c neat.c nethandler.c nmi.c nvr.c olivetti_m24.c opti.c pc.c pc87306.c pci.c pic.c piix.c pit.c ppi.c ps1.c rom.c rtc.c +scat.c scattergather.c scsi.c scsi_cdrom.c serial.c sis496.c sis85c471.c sio.c sound.c sound_ad1848.c sound_adlib.c sound_adlibgold.c sound_cms.c +sound_dbopl.cc sound_emu8k.c sound_gus.c sound_mpu401_uart.c sound_opl.c sound_pas16.c sound_ps1.c sound_pssj.c sound_resid.cc +sound_sb.c sound_sb_dsp.c sound_sn76489.c sound_speaker.c sound_ssi2001.c sound_wss.c sound_ym7128.c +soundopenal.c tandy_eeprom.c tandy_rom.c timer.c um8669f.c vid_ati_eeprom.c vid_ati_mach64.c vid_ati18800.c +vid_ati28800.c vid_ati68860_ramdac.c vid_bt485_ramdac.c vid_cga.c vid_cl_gd.c vid_cl_gd_blit.c vid_cl_ramdac.c vid_colorplus.c vid_ega.c vid_et4000.c +vid_et4000w32.c vid_hercules.c vid_herculesplus.c vid_icd2061.c vid_ics2595.c vid_incolor.c vid_mda.c vid_nv_riva128.c vid_nv_rivatnt.c +vid_olivetti_m24.c vid_oti067.c vid_paradise.c vid_pc1512.c vid_pc1640.c vid_pc200.c +vid_pcjr.c vid_ps1_svga.c vid_s3.c vid_s3_virge.c vid_sdac_ramdac.c vid_stg_ramdac.c vid_svga.c +vid_svga_render.c vid_tandy.c vid_tandysl.c vid_tgui9440.c vid_tkd8001_ramdac.c vid_tvga.c vid_unk_ramdac.c +vid_vga.c vid_voodoo.c video.c wd76c10.c win.c win-config.c win-d3d.cc win-d3d-fs.cc win-ddraw.cc +win-ddraw-fs.cc win-ddraw-screenshot.cc win-deviceconfig.c win-hdconf.c win-joystick.cc win-joystickconfig.c win-keyboard.cc win-midi.c win-mouse.cc +win-status.c win-video.c x86seg.c x87.c xtide.c pc.rc +dosbox/dbopl.cpp dosbox/nukedopl.cpp dosbox/vid_cga_comp.c +lzf/lzf_c.c lzf/lzf_d.c +resid-fp/convolve.cc resid-fp/convolve-sse.cc resid-fp/envelope.cc resid-fp/extfilt.cc resid-fp/filter.cc resid-fp/pot.cc resid-fp/sid.cc resid-fp/voice.cc resid-fp/wave6581__ST.cc resid-fp/wave6581_P_T.cc resid-fp/wave6581_PS_.cc resid-fp/wave6581_PST.cc resid-fp/wave8580__ST.cc resid-fp/wave8580_P_T.cc resid-fp/wave8580_PS_.cc resid-fp/wave8580_PST.cc resid-fp/wave.cc +slirp/bootp.c slirp/ip_icmp.c slirp/misc.c slirp/socket.c slirp/tcp_timer.c slirp/cksum.c slirp/ip_input.c slirp/queue.c slirp/tcp_input.c slirp/tftp.c slirp/debug.c slirp/ip_output.c slirp/sbuf.c slirp/tcp_output.c slirp/udp.c slirp/if.c slirp/mbuf.c slirp/slirp.c slirp/tcp_subr.c +) + +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(_ARCH_64 1) +else() + set(_ARCH_32 1) +endif() + +include(FindOpenAL REQUIRED) +include(FindDirectInput REQUIRED) +include(FindDirectDraw REQUIRED) + +if(_ARCH_32) +set(SRCS ${SRCS} +codegen_x86.c +) +else() +set(SRCS ${SRCS} +codegen_x86-64.c +) +endif() + +add_definitions(-msse2 -mstackrealign -mwindows) + +add_executable(86box ${SRCS}) + +target_link_libraries(86box winmm openal.dll openal ddraw dinput8 dxguid d3d9 d3dx9 wsock32 iphlpapi stdc++) \ No newline at end of file diff --git a/src/CMakeModules/FindD3D9.cmake b/src/CMakeModules/FindD3D9.cmake new file mode 100644 index 000000000..6e7ed3237 --- /dev/null +++ b/src/CMakeModules/FindD3D9.cmake @@ -0,0 +1,53 @@ +# Locate directdraw +# This module defines +# D3D9_LIBRARIES +# D3D9_FOUND, if false, do not try to link to directinput +# D3D9_INCLUDE_DIR, where to find the headers +# +# $D3D9_DIR is an environment variable that would +# point to the this path in the plateform devkit (Samples\Multimedia\DirectShow) +# +# Created by Cedric Pinson. +# + +SET( D3D9_FOUND FALSE ) + +IF( WIN32 ) + FIND_PATH( D3D9_ROOT_DIR Include/D3D9.h + PATHS + $ENV{PATH} + $ENV{PROGRAMFILES} + ) + + FIND_PATH( D3D9_INCLUDE_DIR d3d9.h + PATHS + ${D3D9_ROOT_DIR}/Include + ) + + FIND_LIBRARY( D3D9_LIBRARY d3d9.lib d3dx9 + PATHS + ${D3D9_ROOT_DIR}/lib/x86 + ) + + FIND_LIBRARY( D3D9_GUID_LIBRARY dxguid.lib + PATHS + ${D3D9_ROOT_DIR}/lib/x86 + ) + + FIND_LIBRARY( D3D9_ERR_LIBRARY dxerr.lib + PATHS + ${D3D9_ROOT_DIR}/lib/x86 + ) + + SET( D3D9_LIBRARIES + ${D3D9_LIBRARY} + ${D3D9_GUID_LIBRARY} + ${D3D9_ERR_LIBRARY} + ) + + IF ( D3D9_INCLUDE_DIR AND D3D9_LIBRARIES ) + SET( D3D9_FOUND TRUE ) + ENDIF ( D3D9_INCLUDE_DIR AND D3D9_LIBRARIES ) +ENDIF( WIN32 ) + +MARK_AS_ADVANCED( D3D9_FOUND ) \ No newline at end of file diff --git a/src/CMakeModules/FindDirectDraw.cmake b/src/CMakeModules/FindDirectDraw.cmake new file mode 100644 index 000000000..c5f995313 --- /dev/null +++ b/src/CMakeModules/FindDirectDraw.cmake @@ -0,0 +1,53 @@ +# Locate directdraw +# This module defines +# DDRAW_LIBRARIES +# DDRAW_FOUND, if false, do not try to link to directinput +# DDRAW_INCLUDE_DIR, where to find the headers +# +# $DDRAW_DIR is an environment variable that would +# point to the this path in the plateform devkit (Samples\Multimedia\DirectShow) +# +# Created by Cedric Pinson. +# + +SET( DDRAW_FOUND FALSE ) + +IF( WIN32 ) + FIND_PATH( DDRAW_ROOT_DIR Include/D3D10.h + PATHS + $ENV{PATH} + $ENV{PROGRAMFILES} + ) + + FIND_PATH( DDRAW_INCLUDE_DIR ddraw.h + PATHS + ${DDRAW_ROOT_DIR}/Include + ) + + FIND_LIBRARY( DDRAW_LIBRARY ddraw.lib + PATHS + ${DDRAW_ROOT_DIR}/lib/x86 + ) + + FIND_LIBRARY( DDRAW_GUID_LIBRARY dxguid.lib + PATHS + ${DDRAW_ROOT_DIR}/lib/x86 + ) + + FIND_LIBRARY( DDRAW_ERR_LIBRARY dxerr.lib + PATHS + ${DDRAW_ROOT_DIR}/lib/x86 + ) + + SET( DDRAW_LIBRARIES + ${DDRAW_LIBRARY} + ${DDRAW_GUID_LIBRARY} + ${DDRAW_ERR_LIBRARY} + ) + + IF ( DDRAW_INCLUDE_DIR AND DDRAW_LIBRARIES ) + SET( DDRAW_FOUND TRUE ) + ENDIF ( DDRAW_INCLUDE_DIR AND DDRAW_LIBRARIES ) +ENDIF( WIN32 ) + +MARK_AS_ADVANCED( DDRAW_FOUND ) \ No newline at end of file diff --git a/src/CMakeModules/FindDirectInput.cmake b/src/CMakeModules/FindDirectInput.cmake new file mode 100644 index 000000000..b7b457527 --- /dev/null +++ b/src/CMakeModules/FindDirectInput.cmake @@ -0,0 +1,53 @@ +# Locate directinput +# This module defines +# DIRECTINPUT_LIBRARIES +# DIRECTINPUT_FOUND, if false, do not try to link to directinput +# DIRECTINPUT_INCLUDE_DIR, where to find the headers +# +# $DIRECTINPUT_DIR is an environment variable that would +# point to the this path in the plateform devkit (Samples\Multimedia\DirectShow) +# +# Created by Cedric Pinson. +# + +SET( DIRECTINPUT_FOUND FALSE ) + +IF( WIN32 ) + FIND_PATH( DIRECTINPUT_ROOT_DIR Include/D3D10.h + PATHS + $ENV{PATH} + $ENV{PROGRAMFILES} + ) + + FIND_PATH( DIRECTINPUT_INCLUDE_DIR dinput.h + PATHS + ${DIRECTINPUT_ROOT_DIR}/Include + ) + + FIND_LIBRARY( DIRECTINPUT_LIBRARY dinput7.lib dinput8.lib + PATHS + ${DIRECTINPUT_ROOT_DIR}/lib/x86 + ) + + FIND_LIBRARY( DIRECTINPUT_GUID_LIBRARY dxguid.lib + PATHS + ${DIRECTINPUT_ROOT_DIR}/lib/x86 + ) + + FIND_LIBRARY( DIRECTINPUT_ERR_LIBRARY dxerr.lib + PATHS + ${DIRECTINPUT_ROOT_DIR}/lib/x86 + ) + + SET( DIRECTINPUT_LIBRARIES + ${DIRECTINPUT_LIBRARY} + ${DIRECTINPUT_GUID_LIBRARY} + ${DIRECTINPUT_ERR_LIBRARY} + ) + + IF ( DIRECTINPUT_INCLUDE_DIR AND DIRECTINPUT_LIBRARIES ) + SET( DIRECTINPUT_FOUND TRUE ) + ENDIF ( DIRECTINPUT_INCLUDE_DIR AND DIRECTINPUT_LIBRARIES ) +ENDIF( WIN32 ) + +MARK_AS_ADVANCED( DIRECTINPUT_FOUND ) \ No newline at end of file From f2564a6693e108e25644e366cec1c9cf1459aca5 Mon Sep 17 00:00:00 2001 From: Melissa Goad Date: Fri, 9 Dec 2016 16:38:06 -0600 Subject: [PATCH 2/2] update nvr --- nvr/430vx.nvr | Bin 152 -> 128 bytes nvr/440fx.nvr | Bin 152 -> 128 bytes nvr/586mc1.nvr | Bin 128 -> 128 bytes nvr/acerm3a.nvr | Bin 128 -> 152 bytes nvr/acerv35n.nvr | Bin 128 -> 152 bytes nvr/award286.nvr | Bin 0 -> 128 bytes nvr/dtk486.nvr | Bin 152 -> 128 bytes nvr/endeavor.nvr | Bin 152 -> 128 bytes nvr/ibmps1_2121.nvr | Bin 152 -> 128 bytes nvr/kn97.nvr | Bin 152 -> 128 bytes nvr/mb500n.nvr | Bin 152 -> 128 bytes nvr/p54tp4xe.nvr | Bin 152 -> 128 bytes nvr/p55t2p4.nvr | Bin 152 -> 128 bytes nvr/p55tvp4.nvr | Bin 152 -> 128 bytes nvr/p55va.nvr | Bin 152 -> 128 bytes nvr/pc200.nvr | Bin 152 -> 128 bytes nvr/pc200.nvr.bak | Bin 0 -> 152 bytes nvr/plato.nvr | Bin 128 -> 152 bytes nvr/r418.nvr | Bin 152 -> 128 bytes nvr/revenge.nvr | Bin 152 -> 128 bytes nvr/sis496.nvr | Bin 152 -> 128 bytes nvr/thor.nvr | Bin 0 -> 128 bytes 22 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 nvr/award286.nvr create mode 100644 nvr/pc200.nvr.bak create mode 100644 nvr/thor.nvr diff --git a/nvr/430vx.nvr b/nvr/430vx.nvr index 329a958f8926bdfed268ac94bffe499e4010b27d..0c9299c04d5f851335534d17ef267db7aa488f5f 100644 GIT binary patch literal 128 zcmZ=`FlG>BU{e$nQ)3EfU|?`*_|NFvz{Fsqug}21@RdQ}|Nk!x_HCR%x|P$O>o9|j z0#FqgFi)J_C^7k^sQ_aK2Sbn&M394lL5#uSL>ZXJ*v$;09T^z(VJ7JRWCR-ZgVFv! JP=e2r0RV189)$n^ literal 152 xcmd;J00Cx3#_4KI0Sycc4j?X0zyy?$M99u&kU((AV{ss9V+686_$)gE0{~QA1Bn0t diff --git a/nvr/440fx.nvr b/nvr/440fx.nvr index 3b82111ffe0378030b42b6e1332f2428abd0530f..7e93886f470e46a69ff03d60b6ee6beaab11c699 100644 GIT binary patch delta 92 zcmbQi*uZGO_Fw!z^M5u$<|%4S1^*csM4tR-_HSTfu+i5q`2YVagTVj)Ul{D$IDvF4 nr#)}+L<3#ry$lQw{{R2)`2WBDPe!1`4@P@911SDqwgwT#u>|)0{$~FI6e8m?BBq|V56^J@E^!$_zwgOZJYxC|F?45 z^F~ZG(6z2*V0Zu&b^QNd|0@Gf;tPYl{!d0A;|HTXNV&$O|FS@xx diff --git a/nvr/acerm3a.nvr b/nvr/acerm3a.nvr index 578c9f03f540ead904af4050670636d18521d9e5..4bd806175dae024c30dc294ca67569b9082569de 100644 GIT binary patch literal 152 zcmWG#2w~u4U}9&SuEzBLKLdkP!v}l+1||lJ{|wCk87|m!wh1r*!G8$gUBqA^Ises- zT#<%<8c#rC|NgTH{QtlIKR1Zez`q};Rsg8_C(tMc22qB?3?dAS4InlIu)r8V+5*Hj T2VyfI<^*DPAZ7&Ovp@y_4$Up8 literal 128 zcmZ={U||qqU}0pQwv6fje+CAph7b1s4NMGw{xdNDXSiU`*(SgM1pgs`FOA`kam{rk@*@c;k*|J)!>ga3Y@S^=QypFpD+7(@jQGl(!SHh|ce;15U$0C5Q} A)&Kwi diff --git a/nvr/acerv35n.nvr b/nvr/acerv35n.nvr index a153ab477e30ad3aa560276a8377ebd74821bd75..99f4431c82d25265ea0c69b1a5e7357dae3ac0ab 100644 GIT binary patch literal 152 zcmZ?zZ~343KMOm%*fOU7{}mV<9xLhlH!v|+Feot#FkG;2;}o#}${_F`0(j;!SST>O zI*}{N{?7|6#K`aBQ~*@X%m4%p93YZ`LFUwdMhNRL4}^x3_CFZ~Ko};V4P=-BF((kS L12IV7Ss()dl3FC( literal 128 zcmWIgKlQ)hf2OHZL)Do6|7T!uc&woB-@wH1hk=1vfZ>AuaV7xCZ+a4|A4JOB$5O>khS1ON~<5Ly5L literal 0 HcmV?d00001 diff --git a/nvr/dtk486.nvr b/nvr/dtk486.nvr index 81762a976be1e12dfdfe6a184eef79a209b215f8..8b0adf5647b0cf99286cac35f8a8ef8bec27fbac 100644 GIT binary patch delta 72 zcmbQi*udz({6F-+;D2Uz#_4KI1^*csT(*2*@^4^burXv<^&iNG00jnx|NrF~>^X86 SY$O~0LjZG8*NcdW4h{fr>l*j~ delta 97 zcmZo*oWbaz@n7vf=YJ-4#_4KI0sk2ogtmNO@@-&Zh%sbX^&iNGfd7mF|NsAEwCCbr jh>>jg4*|@@9WNv%Iygwk02N6AF((kS12H2Ip9L}iNW~oy diff --git a/nvr/endeavor.nvr b/nvr/endeavor.nvr index a46ee6710e3cee4865929c51cc57d4297ef44214..dfbb0f260d7836a1d196e161b315bddaf450f0b6 100644 GIT binary patch delta 70 zcmbQi*uZEJ_FwbAz<+jj#_4KI1^*csTqX)I_%|>y*f1#k|No!Ek^u#<1~Awtw0vOr P|9_&R{KNpxi3th-$f6T_ delta 95 zcmZo*oWW?J@;~@L=YJ-4#_7u#0{$~FxJ(pa@NZyZ_`{&^|NnmuO9m9cCcyAVq2&Yf h|Nj#m-7E=HK diff --git a/nvr/ibmps1_2121.nvr b/nvr/ibmps1_2121.nvr index bea05137db69e3e7d8a3b26e66c7f05ff13305bf..0501a368e3132625fb00aab37f5340e10303a97c 100644 GIT binary patch literal 128 zcmWgtAM{`HKO+;Xm>Pq_e+GuMdIn~O2BrpH1_)q;(hLo}K&hrF49(vz0ND!vsRRHm CR8%nl literal 152 zcmWIkFZ`eJKeIB6SQ|sYe+34$dIn~O1||k81_)q;(hLk%Y4r?EQy7|~n}KYF|5O5| UK=XNl7-Ww)5VHVr4Lbt^0D@vuhyVZp diff --git a/nvr/kn97.nvr b/nvr/kn97.nvr index bed158dc7b1050670d9ebcc5a3abccbcdddeecd1..11001c513d2de9b49ce3926da6c7bb54dc7a7abf 100644 GIT binary patch delta 114 zcmbQi*uZGO`d{R~;C~hsj;U%)1^*csR3H9l@NZyZu+i5y`2YVagTVj)Ul{D$IDvF4 zr#-LTL<4b4o7#8(H2wp@gcJsbU-$lVFfb@E960d*$N&HT%7DW9KN*3_e=yp^8UN*+ GLFxest~f*h delta 138 zcmZo*oWW>d`Jd%K!+&N*#_7wL0{$~FI6eHp;NQT+V56^Z@E^!$_zwgOZJYxC|F?45 z^9oHg5D(l_`|h6xNPI#H1H-R-|2Y^K6c`R1`2XYo|9_=GVg0WRK;>T;?Dc;#0vSIT Y?f=VJfYhr4&0_MYGjv+N8E0EGHExc~qF diff --git a/nvr/mb500n.nvr b/nvr/mb500n.nvr index 7564c0cb94110376b0478a3f222981932fd082cc..d56f1378b32c9f33595f7a9360ea25fcc7069a13 100644 GIT binary patch delta 97 zcmbQi*udyu`d{ro+kZwTK`}L^g8vK*B2PXr`!_H#*y!sQ{0H(Oz=1*F|9^W1dyWYV kHVO^@A%Oqg><7{l9W*2$Y8V;x89>T@FxrFURfPTn06#J#!T_?-RuXF6CE@Relh}Oe=yqXGe7}IUX}YlCy*-w#B4y!1jO7xT*J=5 F008S3E3yCp diff --git a/nvr/p54tp4xe.nvr b/nvr/p54tp4xe.nvr index 544bf833996c886d376e2bdccfb0627c84f7caf3..001a1cabcba66f9d8c12c2a2373217e76717fc16 100644 GIT binary patch literal 128 zcmZShZ}gw(Kbrx^3^k^L1_lO~gCCfj8<-eu^z|7S85yA9KfA#H|Nq$S**7rQNH#D+ z0Q02T4N@H}AVrLft5ksm5KKs6VBoqpA1J5*76+PP4iwgh81$b3%3x&p&&K^92mnF7 B8q@#) literal 152 zcmWIgZ}MN_KeIB6*fOSo{|pQ&5C1dyH!v|+=<6H&|NoUi;Q#+G4EAlDK)RLFp4Xbe zLZRV51n_^H{X??j&&NL<9smEYTKeNFNO(dD1H-R-|A8hcFdR4l68TpSB=mnW0!{eA fXb)%nmwyYAHDO?2Py%8hAQlH=79g%+XJ7yTZ&FH4 diff --git a/nvr/p55t2p4.nvr b/nvr/p55t2p4.nvr index 2c9b27bffcf4616293cc6868262a840aecd07e4b..2361f68717a310eb05c1414ce532389bc11b7cdd 100644 GIT binary patch delta 97 zcmbQi*ud!E@L%IU$A1Hh6`8O~z*y!sU{Qv)zLE!)YFAVl=oItvj i)1Eh(!Dgb7p=|m8|Nr%WG6DsEFxtZz|K*y1;{O5hm?v!j delta 112 zcmZo*oWW?s`k(nf!+#b=Muuff0sk2ooSuGQ@^4^b_@l3H@E^#Bfd9+_|NsAEw&yy; v@Moftp=s&=|Nr%YQb6iI1Bd|x@(ll_q(K6#Kn^olh=G9-NP}<=I|Bm%ZZaX7 diff --git a/nvr/p55va.nvr b/nvr/p55va.nvr index e3e32d6aba93dfb9e428b311c6a271de52df29d6..c168d258bb0a7b06d023d2b7a988f977c72c6b8c 100644 GIT binary patch delta 80 zcmbQi*uZEc_Fv(@*ndV2Au%4s8`!_Hh_^+>D@E^#Bfd7mF|NsAEwC7%U Z;QvG;OHrUGBZEFfj*;O%5GZE+2LMJy8!!L> delta 104 zcmZo*oWW?M@Zada$bVKAL9t~_0sk2ol%D)&_HSTf_@l31@c;i;27&+ozcARhaRTX9 tPJ2E_hCdUHEOq|_0fRmR7%(z`c&f?&MSxrdAm#&N79i#Z;u>}a1^_9fA`bun diff --git a/nvr/pc200.nvr b/nvr/pc200.nvr index bca7ebe912c0b6a3ed7f9e9cec2d0f5c1476ebbf..367d633e99e9c588ceb3738759725b0c0cb978fe 100644 GIT binary patch literal 128 ccmZSkul!%|Ka--M7#q`nqJSh(s)$tt0Nd+!FaQ7m literal 152 ccmZSj&j5r>3=9ly4F3lJfNVwwIqVD!083qWi2wiq diff --git a/nvr/pc200.nvr.bak b/nvr/pc200.nvr.bak new file mode 100644 index 0000000000000000000000000000000000000000..5279898e2fffe6d1952eff0b876b9d2e1b1a0875 GIT binary patch literal 152 icmWIj&-kC=KQjXZ0~^!-0RZMen;C%^8RW1tFaQ8N^LLg2 literal 0 HcmV?d00001 diff --git a/nvr/plato.nvr b/nvr/plato.nvr index b8d5d8404bbd55398ebdd770d666a9960e244e03..521d8198c46b2a74100371d106f952494e8bad7e 100644 GIT binary patch literal 152 zcmZ?%Z~UL>KP!u%SQ|sYe+CAp$wCZ#4NMFc3=RMP|L3-3Kmn`;3>K32A29p}sw57y mO+r@3#E`+j0Tgh04-sYBtqo)-0x=U1vj8zS5ZACXFaQ818570; literal 128 zcmebHZ~C9(KdX|!^frco{|pRHlZ6=g8kiVt7#jZn|Icm7fC5-c7;Gf(e_;3zR7o6Y Vn}n>6i6Mi511RA19wN%L8vw8q6RiLM diff --git a/nvr/r418.nvr b/nvr/r418.nvr index 9edb8061257c280c9e3aefa300a764badea12ad3..6b625e340d7e429e66f429ac2cf6fa7827c4b2d9 100644 GIT binary patch delta 70 zcmbQi*uZFK{9pV(<9{YbMg}#eg8vK*B40i*`8O~z*y!t5{Ri?P;6Jm#|NsA(?YVRr QY!n*)LjeE3?um9z067dB9smFU delta 95 zcmZo*oWW?P@ZaFS(tj31p_$8=0{$~FIDPrROYVV0h5>o{{NrIY|rJ$ j@JF)YKLqgq>zZiiBq0J+A_v4`Kr9c$JV1P&oq+)WlItGA diff --git a/nvr/revenge.nvr b/nvr/revenge.nvr index 2ee09d49db811859a894a1d1e897f04a2c9ff5f5..7592cfc6af296dd569137353c9f79c6428d517e9 100644 GIT binary patch literal 128 zcmY%T&-h>HKQjXZ0~=Gpe+CAJ$wCZ#4NMFc3=RMPGjLl1C6EA1K7)ni{|5{}DI!7J TBxHpO3>gd@KmjMHAmb|llz9-6 literal 152 zcmY%S&+uR9KNAB3LmNZDe+CAJ$qWoU4NMGw7#jZnXW+I3N+1DNd4@ld|35GTrHBM= dlaLiEFk~=r00o?&f{d>upe!CFWjX8&3;^im62AZd diff --git a/nvr/sis496.nvr b/nvr/sis496.nvr index 56f19faafe995293687c49a0e9bb780255c5b20e..90264989fb9b385fba5f263031f34519e2a2128e 100644 GIT binary patch delta 72 zcmbQi*udz({$Cgf8I@VY)R+qXGcbs3`M~Voz{Fsqum9^mkPiX>nFap;|Ho|4mB(PC R(C{Au`2TmGaGdDi004xw9LN9w delta 97 zcmZo*oWbZ|@!$Br;D2Ui7BMxZfd32(DqB7<`!+B!Sm^8j`VZtoKpUsP|NpI=_MDR# kEEF34LjeE(juVU%9ULUofQl4>m>Y=2ftUq|YuFhW07fGn0RR91 diff --git a/nvr/thor.nvr b/nvr/thor.nvr new file mode 100644 index 0000000000000000000000000000000000000000..78eb4f24243b570edb908c4cfca97392a7f654a4 GIT binary patch literal 128 zcmZ?z@BClzKbxYUm>N^Te+CAXi9!ti4NMGw7zF