dosbuild.patch 50 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096109710981099110011011102110311041105110611071108110911101111111211131114111511161117111811191120112111221123112411251126112711281129113011311132113311341135113611371138113911401141114211431144114511461147114811491150115111521153115411551156115711581159116011611162116311641165116611671168116911701171117211731174117511761177117811791180118111821183118411851186118711881189119011911192119311941195119611971198119912001201120212031204120512061207120812091210121112121213121412151216121712181219122012211222122312241225122612271228122912301231123212331234123512361237123812391240124112421243124412451246124712481249125012511252125312541255125612571258125912601261126212631264126512661267126812691270127112721273127412751276127712781279128012811282128312841285128612871288128912901291129212931294129512961297129812991300130113021303130413051306130713081309131013111312131313141315131613171318131913201321132213231324132513261327132813291330133113321333133413351336133713381339134013411342134313441345134613471348134913501351135213531354135513561357135813591360136113621363136413651366136713681369137013711372137313741375137613771378137913801381138213831384138513861387138813891390139113921393139413951396139713981399140014011402140314041405140614071408140914101411141214131414141514161417141814191420142114221423142414251426142714281429143014311432143314341435
  1. diff -Naur ucon64/src/backup/cd64.c ucon64.dos/src/backup/cd64.c
  2. --- ucon64/src/backup/cd64.c 2015-12-09 01:40:57.000000000 +0100
  3. +++ ucon64.dos/src/backup/cd64.c 2016-02-21 00:29:45.729345486 +0100
  4. @@ -28,7 +28,7 @@
  5. #include "misc/misc.h"
  6. #include "misc/parallel.h"
  7. #include "ucon64.h"
  8. -#include "ucon64_misc.h"
  9. +#include "ucon64mi.h"
  10. #include "backup/cd64.h"
  11. diff -Naur ucon64/src/backup/cmc.c ucon64.dos/src/backup/cmc.c
  12. --- ucon64/src/backup/cmc.c 2016-02-20 00:12:57.039070101 +0100
  13. +++ ucon64.dos/src/backup/cmc.c 2016-02-21 00:29:45.729345486 +0100
  14. @@ -131,7 +131,7 @@
  15. #include "misc/parallel.h"
  16. #include "misc/term.h"
  17. #include "ucon64.h"
  18. -#include "ucon64_misc.h"
  19. +#include "ucon64mi.h"
  20. #include "backup/cmc.h"
  21. diff -Naur ucon64/src/backup/dex.c ucon64.dos/src/backup/dex.c
  22. --- ucon64/src/backup/dex.c 2015-12-21 03:42:19.000000000 +0100
  23. +++ ucon64.dos/src/backup/dex.c 2016-02-21 00:29:45.730345450 +0100
  24. @@ -27,7 +27,7 @@
  25. #include "misc/file.h"
  26. #include "misc/parallel.h"
  27. #include "ucon64.h"
  28. -#include "ucon64_misc.h"
  29. +#include "ucon64mi.h"
  30. #include "backup/dex.h"
  31. #include "backup/psxpblib.h"
  32. diff -Naur ucon64/src/backup/doctor64.c ucon64.dos/src/backup/doctor64.c
  33. --- ucon64/src/backup/doctor64.c 2015-12-09 01:44:32.000000000 +0100
  34. +++ ucon64.dos/src/backup/doctor64.c 2016-02-21 00:29:45.730345450 +0100
  35. @@ -29,7 +29,7 @@
  36. #include "misc/file.h"
  37. #include "misc/parallel.h"
  38. #include "ucon64.h"
  39. -#include "ucon64_misc.h"
  40. +#include "ucon64mi.h"
  41. #include "backup/doctor64.h"
  42. diff -Naur ucon64/src/backup/doctor64jr.c ucon64.dos/src/backup/doctor64jr.c
  43. --- ucon64/src/backup/doctor64jr.c 2015-12-21 02:53:20.000000000 +0100
  44. +++ ucon64.dos/src/backup/doctor64jr.c 2016-02-21 00:29:45.730345450 +0100
  45. @@ -135,8 +135,8 @@
  46. #include "misc/archive.h"
  47. #include "misc/parallel.h"
  48. #include "ucon64.h"
  49. -#include "ucon64_misc.h"
  50. -#include "backup/doctor64jr.h"
  51. +#include "ucon64mi.h"
  52. +#include "backup/doctorjr.h"
  53. #ifdef USE_PARALLEL
  54. diff -Naur ucon64/src/backup/f2a.c ucon64.dos/src/backup/f2a.c
  55. --- ucon64/src/backup/f2a.c 2015-12-26 21:19:09.000000000 +0100
  56. +++ ucon64.dos/src/backup/f2a.c 2016-02-21 00:29:45.731345415 +0100
  57. @@ -62,7 +62,7 @@
  58. #include "misc/misc.h"
  59. #include "misc/parallel.h"
  60. #include "misc/property.h"
  61. -#include "ucon64_misc.h"
  62. +#include "ucon64mi.h"
  63. #include "console/gba.h"
  64. #include "backup/f2a.h"
  65. diff -Naur ucon64/src/backup/fal.c ucon64.dos/src/backup/fal.c
  66. --- ucon64/src/backup/fal.c 2015-11-11 00:57:16.000000000 +0100
  67. +++ ucon64.dos/src/backup/fal.c 2016-02-21 00:29:45.731345415 +0100
  68. @@ -28,7 +28,7 @@
  69. #include "misc/archive.h"
  70. #include "misc/parallel.h"
  71. #include "misc/term.h"
  72. -#include "ucon64_misc.h"
  73. +#include "ucon64mi.h"
  74. #include "console/gba.h"
  75. #include "backup/fal.h"
  76. diff -Naur ucon64/src/backup/fig.c ucon64.dos/src/backup/fig.c
  77. --- ucon64/src/backup/fig.c 2015-12-21 01:25:57.000000000 +0100
  78. +++ ucon64.dos/src/backup/fig.c 2016-02-21 00:29:45.732345379 +0100
  79. @@ -27,7 +27,7 @@
  80. #include <string.h>
  81. #include "misc/archive.h"
  82. #include "misc/file.h"
  83. -#include "ucon64_misc.h"
  84. +#include "ucon64mi.h"
  85. #include "console/snes.h" // for snes_get_snes_hirom()
  86. #include "backup/ffe.h"
  87. #include "backup/fig.h"
  88. diff -Naur ucon64/src/backup/gbx.c ucon64.dos/src/backup/gbx.c
  89. --- ucon64/src/backup/gbx.c 2015-12-20 05:48:02.000000000 +0100
  90. +++ ucon64.dos/src/backup/gbx.c 2016-02-21 00:29:45.732345379 +0100
  91. @@ -65,7 +65,7 @@
  92. #include "misc/misc.h"
  93. #include "misc/parallel.h"
  94. #include "misc/term.h"
  95. -#include "ucon64_misc.h"
  96. +#include "ucon64mi.h"
  97. #include "console/gb.h" // GB_NAME_LEN, gb_logodata,
  98. #include "backup/gbx.h" // rocket_logodata
  99. diff -Naur ucon64/src/backup/gd.c ucon64.dos/src/backup/gd.c
  100. --- ucon64/src/backup/gd.c 2016-02-20 00:12:22.444265706 +0100
  101. +++ ucon64.dos/src/backup/gd.c 2016-02-21 00:29:45.733345344 +0100
  102. @@ -30,7 +30,7 @@
  103. #include "misc/parallel.h"
  104. #include "misc/string.h"
  105. #include "misc/term.h"
  106. -#include "ucon64_misc.h"
  107. +#include "ucon64mi.h"
  108. #include "console/snes.h" // for snes_make_gd_names() &
  109. #include "backup/gd.h" // snes_get_snes_hirom()
  110. diff -Naur ucon64/src/backup/lynxit.c ucon64.dos/src/backup/lynxit.c
  111. --- ucon64/src/backup/lynxit.c 2015-11-21 00:32:28.000000000 +0100
  112. +++ ucon64.dos/src/backup/lynxit.c 2016-02-21 00:29:45.733345344 +0100
  113. @@ -28,7 +28,7 @@
  114. #include "misc/archive.h"
  115. #include "misc/parallel.h"
  116. #include "misc/term.h"
  117. -#include "ucon64_misc.h"
  118. +#include "ucon64mi.h"
  119. #include "console/lynx.h"
  120. #include "backup/lynxit.h"
  121. diff -Naur ucon64/src/backup/mccl.c ucon64.dos/src/backup/mccl.c
  122. --- ucon64/src/backup/mccl.c 2015-12-09 01:47:34.000000000 +0100
  123. +++ ucon64.dos/src/backup/mccl.c 2016-02-21 00:29:45.733345344 +0100
  124. @@ -67,7 +67,7 @@
  125. #include "misc/file.h"
  126. #include "misc/parallel.h"
  127. #include "ucon64.h"
  128. -#include "ucon64_misc.h"
  129. +#include "ucon64mi.h"
  130. #include "backup/mccl.h"
  131. diff -Naur ucon64/src/backup/mcd.c ucon64.dos/src/backup/mcd.c
  132. --- ucon64/src/backup/mcd.c 2015-12-21 01:03:41.000000000 +0100
  133. +++ ucon64.dos/src/backup/mcd.c 2016-02-21 00:29:45.733345344 +0100
  134. @@ -27,7 +27,7 @@
  135. #include "misc/parallel.h"
  136. #include "misc/term.h"
  137. #include "ucon64.h"
  138. -#include "ucon64_misc.h"
  139. +#include "ucon64mi.h"
  140. #include "backup/mcd.h"
  141. diff -Naur ucon64/src/backup/md-pro.c ucon64.dos/src/backup/md-pro.c
  142. --- ucon64/src/backup/md-pro.c 2015-12-31 18:49:57.000000000 +0100
  143. +++ ucon64.dos/src/backup/md-pro.c 2016-02-21 00:29:45.734345310 +0100
  144. @@ -30,7 +30,7 @@
  145. #include <string.h>
  146. #include "misc/archive.h"
  147. #include "ucon64.h"
  148. -#include "ucon64_misc.h"
  149. +#include "ucon64mi.h"
  150. #include "backup/tototek.h"
  151. #include "backup/md-pro.h"
  152. diff -Naur ucon64/src/backup/mgd.c ucon64.dos/src/backup/mgd.c
  153. --- ucon64/src/backup/mgd.c 2015-12-21 02:55:42.000000000 +0100
  154. +++ ucon64.dos/src/backup/mgd.c 2016-02-21 00:29:45.734345310 +0100
  155. @@ -24,7 +24,7 @@
  156. #include "misc/file.h"
  157. #include "misc/string.h"
  158. #include "ucon64.h"
  159. -#include "ucon64_misc.h"
  160. +#include "ucon64mi.h"
  161. #include "backup/mgd.h"
  162. diff -Naur ucon64/src/backup/msg.c ucon64.dos/src/backup/msg.c
  163. --- ucon64/src/backup/msg.c 2015-12-21 02:56:30.000000000 +0100
  164. +++ ucon64.dos/src/backup/msg.c 2016-02-21 00:29:45.734345310 +0100
  165. @@ -25,7 +25,7 @@
  166. #include "misc/archive.h"
  167. #include "misc/misc.h"
  168. #include "ucon64.h"
  169. -#include "ucon64_misc.h"
  170. +#include "ucon64mi.h"
  171. #include "backup/ffe.h"
  172. #include "backup/msg.h"
  173. diff -Naur ucon64/src/backup/pce-pro.c ucon64.dos/src/backup/pce-pro.c
  174. --- ucon64/src/backup/pce-pro.c 2015-12-31 18:40:09.000000000 +0100
  175. +++ ucon64.dos/src/backup/pce-pro.c 2016-02-21 00:29:45.735345275 +0100
  176. @@ -29,7 +29,7 @@
  177. #include <string.h>
  178. #include "misc/archive.h"
  179. #include "ucon64.h"
  180. -#include "ucon64_misc.h"
  181. +#include "ucon64mi.h"
  182. #include "backup/tototek.h"
  183. #include "backup/pce-pro.h"
  184. diff -Naur ucon64/src/backup/pl.c ucon64.dos/src/backup/pl.c
  185. --- ucon64/src/backup/pl.c 2015-12-21 02:58:47.000000000 +0100
  186. +++ ucon64.dos/src/backup/pl.c 2016-02-21 00:29:45.735345275 +0100
  187. @@ -27,7 +27,7 @@
  188. #include "misc/archive.h"
  189. #include "misc/parallel.h"
  190. #include "ucon64.h"
  191. -#include "ucon64_misc.h"
  192. +#include "ucon64mi.h"
  193. #include "backup/pl.h"
  194. diff -Naur ucon64/src/backup/quickdev16.c ucon64.dos/src/backup/quickdev16.c
  195. --- ucon64/src/backup/quickdev16.c 2016-02-18 18:37:17.095559993 +0100
  196. +++ ucon64.dos/src/backup/quickdev16.c 2016-02-21 00:29:45.735345275 +0100
  197. @@ -38,9 +38,9 @@
  198. #include "misc/term.h"
  199. #include "misc/usb.h"
  200. #include "ucon64.h"
  201. -#include "ucon64_misc.h"
  202. +#include "ucon64mi.h"
  203. #include "console/snes.h"
  204. -#include "backup/quickdev16.h"
  205. +#include "backup/quickdev.h"
  206. #ifdef USE_USB
  207. diff -Naur ucon64/src/backup/sflash.c ucon64.dos/src/backup/sflash.c
  208. --- ucon64/src/backup/sflash.c 2015-12-21 03:01:06.000000000 +0100
  209. +++ ucon64.dos/src/backup/sflash.c 2016-02-21 00:29:45.735345275 +0100
  210. @@ -25,7 +25,7 @@
  211. #include <stdlib.h>
  212. #include "misc/archive.h"
  213. #include "ucon64.h"
  214. -#include "ucon64_misc.h"
  215. +#include "ucon64mi.h"
  216. #include "backup/tototek.h"
  217. #include "backup/sflash.h"
  218. diff -Naur ucon64/src/backup/smc.c ucon64.dos/src/backup/smc.c
  219. --- ucon64/src/backup/smc.c 2015-12-09 01:54:20.000000000 +0100
  220. +++ ucon64.dos/src/backup/smc.c 2016-02-21 00:29:45.736345241 +0100
  221. @@ -25,7 +25,7 @@
  222. #include <string.h>
  223. #include "misc/archive.h"
  224. #include "ucon64.h"
  225. -#include "ucon64_misc.h"
  226. +#include "ucon64mi.h"
  227. #include "backup/ffe.h"
  228. #include "backup/smc.h"
  229. diff -Naur ucon64/src/backup/smd.c ucon64.dos/src/backup/smd.c
  230. --- ucon64/src/backup/smd.c 2015-12-21 03:01:51.000000000 +0100
  231. +++ ucon64.dos/src/backup/smd.c 2016-02-21 00:29:45.736345241 +0100
  232. @@ -26,7 +26,7 @@
  233. #include "misc/archive.h"
  234. #include "misc/misc.h"
  235. #include "ucon64.h"
  236. -#include "ucon64_misc.h"
  237. +#include "ucon64mi.h"
  238. #include "backup/ffe.h"
  239. #include "backup/smd.h"
  240. diff -Naur ucon64/src/backup/smsgg-pro.c ucon64.dos/src/backup/smsgg-pro.c
  241. --- ucon64/src/backup/smsgg-pro.c 2015-12-31 18:40:36.000000000 +0100
  242. +++ ucon64.dos/src/backup/smsgg-pro.c 2016-02-21 00:29:45.736345241 +0100
  243. @@ -29,9 +29,9 @@
  244. #include <string.h>
  245. #include "misc/archive.h"
  246. #include "ucon64.h"
  247. -#include "ucon64_misc.h"
  248. +#include "ucon64mi.h"
  249. #include "backup/tototek.h"
  250. -#include "backup/smsgg-pro.h"
  251. +#include "backup/smsggpro.h"
  252. #ifdef USE_PARALLEL
  253. diff -Naur ucon64/src/backup/swc.c ucon64.dos/src/backup/swc.c
  254. --- ucon64/src/backup/swc.c 2015-12-21 03:04:30.000000000 +0100
  255. +++ ucon64.dos/src/backup/swc.c 2016-02-21 00:29:45.737345206 +0100
  256. @@ -28,7 +28,7 @@
  257. #include <stdlib.h>
  258. #include "misc/archive.h"
  259. #include "misc/misc.h"
  260. -#include "ucon64_misc.h"
  261. +#include "ucon64mi.h"
  262. #include "console/snes.h" // for snes_get_file_type ()
  263. #include "backup/ffe.h"
  264. #include "backup/swc.h"
  265. diff -Naur ucon64/src/config.h.orig ucon64.dos/src/config.h.orig
  266. --- ucon64/src/config.h.orig 2015-12-31 18:32:24.000000000 +0100
  267. +++ ucon64.dos/src/config.h.orig 2016-02-21 00:29:45.737345206 +0100
  268. @@ -107,7 +107,7 @@
  269. //#define USE_USB 1
  270. /* build with gzip and zip support (default: yes) */
  271. -//#define USE_ZLIB 1
  272. +#define USE_ZLIB 1
  273. /* Define to empty if `const' does not conform to ANSI C. */
  274. /* #undef const */
  275. diff -Naur ucon64/src/config.mak.orig ucon64.dos/src/config.mak.orig
  276. --- ucon64/src/config.mak.orig 2015-12-26 20:01:30.000000000 +0100
  277. +++ ucon64.dos/src/config.mak.orig 2016-02-21 00:29:45.737345206 +0100
  278. @@ -1,5 +1,5 @@
  279. DLOPEN=1
  280. -#USE_ZLIB=1
  281. +USE_ZLIB=1
  282. USE_DISCMAGE=1
  283. #USE_USB=1
  284. USE_LIBCD64=1
  285. diff -Naur ucon64/src/console/atari.c ucon64.dos/src/console/atari.c
  286. --- ucon64/src/console/atari.c 2015-12-20 01:58:41.000000000 +0100
  287. +++ ucon64.dos/src/console/atari.c 2016-02-21 00:29:45.737345206 +0100
  288. @@ -27,7 +27,7 @@
  289. #include "misc/file.h"
  290. #include "misc/string.h"
  291. #include "misc/term.h"
  292. -#include "ucon64_misc.h"
  293. +#include "ucon64mi.h"
  294. #include "console/atari.h"
  295. #include "backup/cc2.h"
  296. #include "backup/spsc.h"
  297. diff -Naur ucon64/src/console/coleco.c ucon64.dos/src/console/coleco.c
  298. --- ucon64/src/console/coleco.c 2015-11-13 01:24:58.000000000 +0100
  299. +++ ucon64.dos/src/console/coleco.c 2016-02-21 00:29:45.737345206 +0100
  300. @@ -23,7 +23,7 @@
  301. #include <string.h>
  302. #include "misc/archive.h"
  303. #include "misc/file.h"
  304. -#include "ucon64_misc.h"
  305. +#include "ucon64mi.h"
  306. #include "console/coleco.h"
  307. #include "backup/backup.h"
  308. diff -Naur ucon64/src/console/dc.c ucon64.dos/src/console/dc.c
  309. --- ucon64/src/console/dc.c 2015-12-20 02:27:47.000000000 +0100
  310. +++ ucon64.dos/src/console/dc.c 2016-02-21 00:29:45.738345171 +0100
  311. @@ -36,7 +36,7 @@
  312. #include "misc/file.h"
  313. #include "misc/property.h"
  314. #include "misc/string.h"
  315. -#include "ucon64_misc.h"
  316. +#include "ucon64mi.h"
  317. #include "console/dc.h"
  318. diff -Naur ucon64/src/console/gba.c ucon64.dos/src/console/gba.c
  319. --- ucon64/src/console/gba.c 2016-02-20 00:10:19.513514223 +0100
  320. +++ ucon64.dos/src/console/gba.c 2016-02-21 00:29:45.738345171 +0100
  321. @@ -40,7 +40,7 @@
  322. #include "misc/misc.h"
  323. #include "misc/property.h"
  324. #include "misc/string.h"
  325. -#include "ucon64_misc.h"
  326. +#include "ucon64mi.h"
  327. #include "console/console.h"
  328. #include "console/gba.h"
  329. #include "backup/backup.h"
  330. diff -Naur ucon64/src/console/gb.c ucon64.dos/src/console/gb.c
  331. --- ucon64/src/console/gb.c 2016-02-19 23:55:49.342151961 +0100
  332. +++ ucon64.dos/src/console/gb.c 2016-02-21 00:29:45.738345171 +0100
  333. @@ -27,7 +27,7 @@
  334. #include "misc/file.h"
  335. #include "misc/misc.h"
  336. #include "misc/string.h"
  337. -#include "ucon64_misc.h"
  338. +#include "ucon64mi.h"
  339. #include "console/console.h"
  340. #include "console/gb.h"
  341. #include "console/nes.h"
  342. diff -Naur ucon64/src/console/genesis.c ucon64.dos/src/console/genesis.c
  343. --- ucon64/src/console/genesis.c 2016-02-20 00:16:24.220909846 +0100
  344. +++ ucon64.dos/src/console/genesis.c 2016-02-21 00:29:45.739345137 +0100
  345. @@ -40,7 +40,7 @@
  346. #include "misc/chksum.h"
  347. #include "misc/file.h"
  348. #include "misc/misc.h"
  349. -#include "ucon64_misc.h"
  350. +#include "ucon64mi.h"
  351. #include "console/genesis.h"
  352. #include "backup/md-pro.h"
  353. #include "backup/mgd.h"
  354. diff -Naur ucon64/src/console/jaguar.c ucon64.dos/src/console/jaguar.c
  355. --- ucon64/src/console/jaguar.c 2015-12-23 00:12:44.000000000 +0100
  356. +++ ucon64.dos/src/console/jaguar.c 2016-02-21 00:29:45.739345137 +0100
  357. @@ -20,7 +20,7 @@
  358. */
  359. #include "misc/archive.h"
  360. #include "misc/file.h"
  361. -#include "ucon64_misc.h"
  362. +#include "ucon64mi.h"
  363. #include "console/jaguar.h"
  364. #include "backup/backup.h"
  365. diff -Naur ucon64/src/console/lynx.c ucon64.dos/src/console/lynx.c
  366. --- ucon64/src/console/lynx.c 2015-11-14 21:57:52.000000000 +0100
  367. +++ ucon64.dos/src/console/lynx.c 2016-02-21 00:29:45.739345137 +0100
  368. @@ -24,7 +24,7 @@
  369. #include "misc/archive.h"
  370. #include "misc/bswap.h"
  371. #include "misc/file.h"
  372. -#include "ucon64_misc.h"
  373. +#include "ucon64mi.h"
  374. #include "console/lynx.h"
  375. #include "backup/backup.h"
  376. diff -Naur ucon64/src/console/n64.c ucon64.dos/src/console/n64.c
  377. --- ucon64/src/console/n64.c 2015-11-14 21:59:47.000000000 +0100
  378. +++ ucon64.dos/src/console/n64.c 2016-02-21 00:29:45.740345102 +0100
  379. @@ -34,7 +34,7 @@
  380. #include "misc/chksum.h"
  381. #include "misc/file.h"
  382. #include "misc/misc.h"
  383. -#include "ucon64_misc.h"
  384. +#include "ucon64mi.h"
  385. #include "console/n64.h"
  386. #include "backup/backup.h"
  387. #include "backup/doctor64.h"
  388. diff -Naur ucon64/src/console/nds.c ucon64.dos/src/console/nds.c
  389. --- ucon64/src/console/nds.c 2016-01-11 00:49:45.000000000 +0100
  390. +++ ucon64.dos/src/console/nds.c 2016-02-21 00:29:45.740345102 +0100
  391. @@ -25,7 +25,7 @@
  392. #include "misc/chksum.h"
  393. #include "misc/file.h"
  394. #include "misc/misc.h"
  395. -#include "ucon64_misc.h"
  396. +#include "ucon64mi.h"
  397. #include "console/console.h"
  398. #include "console/nds.h"
  399. #include "backup/backup.h"
  400. diff -Naur ucon64/src/console/neogeo.c ucon64.dos/src/console/neogeo.c
  401. --- ucon64/src/console/neogeo.c 2015-11-15 02:40:19.000000000 +0100
  402. +++ ucon64.dos/src/console/neogeo.c 2016-02-21 00:29:45.740345102 +0100
  403. @@ -21,7 +21,7 @@
  404. #include <string.h>
  405. #include "misc/archive.h"
  406. #include "misc/file.h"
  407. -#include "ucon64_misc.h"
  408. +#include "ucon64mi.h"
  409. #include "console/neogeo.h"
  410. #include "backup/backup.h"
  411. diff -Naur ucon64/src/console/nes.c ucon64.dos/src/console/nes.c
  412. --- ucon64/src/console/nes.c 2016-02-20 00:23:13.593773842 +0100
  413. +++ ucon64.dos/src/console/nes.c 2016-02-21 00:29:45.741345068 +0100
  414. @@ -34,7 +34,7 @@
  415. #include "misc/file.h"
  416. #include "misc/misc.h"
  417. #include "misc/string.h"
  418. -#include "ucon64_misc.h"
  419. +#include "ucon64mi.h"
  420. #include "console/nes.h"
  421. #include "backup/smc.h"
  422. diff -Naur ucon64/src/console/ngp.c ucon64.dos/src/console/ngp.c
  423. --- ucon64/src/console/ngp.c 2015-11-15 03:19:49.000000000 +0100
  424. +++ ucon64.dos/src/console/ngp.c 2016-02-21 00:29:45.741345068 +0100
  425. @@ -22,7 +22,7 @@
  426. #include <string.h>
  427. #include "misc/archive.h"
  428. #include "misc/file.h"
  429. -#include "ucon64_misc.h"
  430. +#include "ucon64mi.h"
  431. #include "console/ngp.h"
  432. #include "backup/backup.h"
  433. #include "backup/pl.h"
  434. diff -Naur ucon64/src/console/pce.c ucon64.dos/src/console/pce.c
  435. --- ucon64/src/console/pce.c 2016-02-20 00:22:26.274404498 +0100
  436. +++ ucon64.dos/src/console/pce.c 2016-02-21 00:29:45.742345033 +0100
  437. @@ -40,7 +40,7 @@
  438. #include "misc/file.h"
  439. #include "misc/misc.h"
  440. #include "misc/string.h"
  441. -#include "ucon64_misc.h"
  442. +#include "ucon64mi.h"
  443. #include "console/pce.h"
  444. #include "backup/mgd.h"
  445. #include "backup/msg.h"
  446. diff -Naur ucon64/src/console/sms.c ucon64.dos/src/console/sms.c
  447. --- ucon64/src/console/sms.c 2016-02-20 00:25:46.903490693 +0100
  448. +++ ucon64.dos/src/console/sms.c 2016-02-21 00:29:45.742345033 +0100
  449. @@ -41,11 +41,11 @@
  450. #include "misc/getopt2.h" // st_getopt2_t
  451. #include "misc/misc.h"
  452. #include "misc/string.h"
  453. -#include "ucon64_misc.h"
  454. +#include "ucon64mi.h"
  455. #include "console/sms.h"
  456. #include "backup/mgd.h"
  457. #include "backup/smd.h"
  458. -#include "backup/smsgg-pro.h"
  459. +#include "backup/smsggpro.h"
  460. #define SMS_HEADER_START 0x7ff0
  461. diff -Naur ucon64/src/console/snes.c ucon64.dos/src/console/snes.c
  462. --- ucon64/src/console/snes.c 2016-02-20 00:11:06.949874811 +0100
  463. +++ ucon64.dos/src/console/snes.c 2016-02-21 00:29:45.743344998 +0100
  464. @@ -43,7 +43,7 @@
  465. #include "misc/file.h"
  466. #include "misc/misc.h"
  467. #include "misc/string.h"
  468. -#include "ucon64_misc.h"
  469. +#include "ucon64mi.h"
  470. #include "console/console.h"
  471. #include "console/snes.h"
  472. #include "backup/backup.h"
  473. diff -Naur ucon64/src/console/swan.c ucon64.dos/src/console/swan.c
  474. --- ucon64/src/console/swan.c 2015-11-15 03:45:21.000000000 +0100
  475. +++ ucon64.dos/src/console/swan.c 2016-02-21 00:29:45.743344998 +0100
  476. @@ -22,7 +22,7 @@
  477. #include "misc/archive.h"
  478. #include "misc/file.h"
  479. #include "misc/misc.h"
  480. -#include "ucon64_misc.h"
  481. +#include "ucon64mi.h"
  482. #include "console/swan.h"
  483. #include "backup/backup.h"
  484. diff -Naur ucon64/src/console/vboy.c ucon64.dos/src/console/vboy.c
  485. --- ucon64/src/console/vboy.c 2015-11-15 04:00:10.000000000 +0100
  486. +++ ucon64.dos/src/console/vboy.c 2016-02-21 00:29:45.743344998 +0100
  487. @@ -21,7 +21,7 @@
  488. #include <string.h>
  489. #include "misc/archive.h"
  490. #include "misc/file.h"
  491. -#include "ucon64_misc.h"
  492. +#include "ucon64mi.h"
  493. #include "console/console.h"
  494. #include "console/vboy.h"
  495. #include "backup/backup.h"
  496. diff -Naur ucon64/src/dosprep.sh ucon64.dos/src/dosprep.sh
  497. --- ucon64/src/dosprep.sh 1970-01-01 01:00:00.000000000 +0100
  498. +++ ucon64.dos/src/dosprep.sh 2016-02-21 00:29:45.743344998 +0100
  499. @@ -0,0 +1,76 @@
  500. +#! /bin/bash
  501. +
  502. +prepare_for_DOS()
  503. +{
  504. + mv ucon64_dat.c ucon64da.c
  505. + mv ucon64_dat.h ucon64da.h
  506. + mv ucon64_defines.h ucon64de.h
  507. + mv ucon64_misc.c ucon64mi.c
  508. + mv ucon64_misc.h ucon64mi.h
  509. + mv ucon64_opts.c ucon64op.c
  510. + mv ucon64_opts.h ucon64op.h
  511. + mv backup/doctor64jr.c backup/doctorjr.c
  512. + mv backup/doctor64jr.h backup/doctorjr.h
  513. + mv backup/interceptor.c backup/intercep.c
  514. + mv backup/interceptor.h backup/intercep.h
  515. + mv backup/quickdev16.c backup/quickdev.c
  516. + mv backup/quickdev16.h backup/quickdev.h
  517. + mv backup/smsgg-pro.c backup/smsggpro.c
  518. + mv backup/smsgg-pro.h backup/smsggpro.h
  519. + mv misc/dxedll_pub.h misc/dxedllpu.h
  520. +
  521. + mv libdiscmage discmage
  522. + mv discmage/libdiscmage.h discmage/discmage.h
  523. + mv discmage/dxedll_priv.h discmage/dxedllpr.h
  524. + mv discmage/dxedll_pub.h discmage/dxedllpu.h
  525. + mv discmage/libdm_misc.c discmage/libdmmis.c
  526. + mv discmage/libdm_misc.h discmage/libdmmis.h
  527. +
  528. + cp config.h.orig config.h
  529. + cp config.mak.orig config.mak
  530. + cp config.h discmage
  531. + cp discmage/Makefile.orig discmage/Makefile
  532. +}
  533. +
  534. +undo_preparations_for_DOS()
  535. +{
  536. + mv ucon64da.c ucon64_dat.c
  537. + mv ucon64da.h ucon64_dat.h
  538. + mv ucon64de.h ucon64_defines.h
  539. + mv ucon64mi.c ucon64_misc.c
  540. + mv ucon64mi.h ucon64_misc.h
  541. + mv ucon64op.c ucon64_opts.c
  542. + mv ucon64op.h ucon64_opts.h
  543. + mv backup/doctorjr.c backup/doctor64jr.c
  544. + mv backup/doctorjr.h backup/doctor64jr.h
  545. + mv backup/intercep.c backup/interceptor.c
  546. + mv backup/intercep.h backup/interceptor.h
  547. + mv backup/quickdev.c backup/quickdev16.c
  548. + mv backup/quickdev.h backup/quickdev16.h
  549. + mv backup/smsggpro.c backup/smsgg-pro.c
  550. + mv backup/smsggpro.h backup/smsgg-pro.h
  551. + mv misc/dxedllpu.h misc/dxedll_pub.h
  552. +
  553. + mv discmage libdiscmage
  554. + mv libdiscmage/discmage.h libdiscmage/libdiscmage.h
  555. + mv libdiscmage/dxedllpr.h libdiscmage/dxedll_priv.h
  556. + mv libdiscmage/dxedllpu.h libdiscmage/dxedll_pub.h
  557. + mv libdiscmage/libdmmis.c libdiscmage/libdm_misc.c
  558. + mv libdiscmage/libdmmis.h libdiscmage/libdm_misc.h
  559. +
  560. + rm config.h
  561. + rm config.mak
  562. + rm libdiscmage/config.h
  563. + rm libdiscmage/Makefile
  564. +}
  565. +
  566. +if [ "$1" == p ]; then
  567. + prepare_for_DOS
  568. +elif [ "$1" == u ]; then
  569. + undo_preparations_for_DOS
  570. +else
  571. + echo Usage: $0 "[p|u]"
  572. + echo "p prepare for DOS"
  573. + echo "u undo preparations for DOS"
  574. + exit
  575. +fi
  576. diff -Naur ucon64/src/libdiscmage/djimport.c ucon64.dos/src/libdiscmage/djimport.c
  577. --- ucon64/src/libdiscmage/djimport.c 2004-07-23 01:09:15.000000000 +0200
  578. +++ ucon64.dos/src/libdiscmage/djimport.c 2016-02-21 00:29:45.744344964 +0100
  579. @@ -20,8 +20,8 @@
  580. */
  581. #include <stdio.h>
  582. #include "dlopen.h"
  583. -#include "dxedll_pub.h"
  584. -#include "libdiscmage.h"
  585. +#include "dxedllpu.h"
  586. +#include "discmage.h"
  587. #define CHECK \
  588. if (!dxe_loaded) \
  589. diff -Naur ucon64/src/libdiscmage/dllinit.c ucon64.dos/src/libdiscmage/dllinit.c
  590. --- ucon64/src/libdiscmage/dllinit.c 2016-01-11 00:41:41.000000000 +0100
  591. +++ ucon64.dos/src/libdiscmage/dllinit.c 2016-02-21 00:29:45.744344964 +0100
  592. @@ -28,7 +28,7 @@
  593. #include <stdio.h>
  594. #include <string.h>
  595. -#include "libdiscmage.h"
  596. +#include "discmage.h"
  597. #if defined __CYGWIN__ || defined _WIN32
  598. @@ -72,8 +72,8 @@
  599. }
  600. #elif defined DJGPP
  601. -#include "dxedll_pub.h" // for st_symbol_t
  602. -#include "dxedll_priv.h" // must be included after headers
  603. +#include "dxedllpu.h" // for st_symbol_t
  604. +#include "dxedllpr.h" // must be included after headers
  605. #include "map.h" // of external libraries!
  606. diff -Naur ucon64/src/libdiscmage/dlopen.c ucon64.dos/src/libdiscmage/dlopen.c
  607. --- ucon64/src/libdiscmage/dlopen.c 2015-12-29 04:18:14.000000000 +0100
  608. +++ ucon64.dos/src/libdiscmage/dlopen.c 2016-02-21 00:29:45.744344964 +0100
  609. @@ -48,7 +48,7 @@
  610. #ifdef DJGPP
  611. -#include "dxedll_pub.h"
  612. +#include "dxedllpu.h"
  613. #include "map.h"
  614. diff -Naur ucon64/src/libdiscmage/dxedll_priv.h ucon64.dos/src/libdiscmage/dxedll_priv.h
  615. --- ucon64/src/libdiscmage/dxedll_priv.h 2004-07-23 01:10:32.000000000 +0200
  616. +++ ucon64.dos/src/libdiscmage/dxedll_priv.h 2016-02-21 00:29:45.744344964 +0100
  617. @@ -22,7 +22,7 @@
  618. #ifndef DXEDLL_PRIV_H
  619. #define DXEDLL_PRIV_H
  620. -#include "dxedll_pub.h"
  621. +#include "dxedllpu.h"
  622. #ifdef __cplusplus
  623. extern "C" {
  624. diff -Naur ucon64/src/libdiscmage/dxe_misc.c ucon64.dos/src/libdiscmage/dxe_misc.c
  625. --- ucon64/src/libdiscmage/dxe_misc.c 2016-02-10 01:47:33.000000000 +0100
  626. +++ ucon64.dos/src/libdiscmage/dxe_misc.c 2016-02-21 00:29:45.744344964 +0100
  627. @@ -32,7 +32,7 @@
  628. #include "config.h"
  629. #endif
  630. #include <stdio.h>
  631. -#include "dxedll_pub.h"
  632. +#include "dxedllpu.h"
  633. extern st_symbol_t import_export;
  634. diff -Naur ucon64/src/libdiscmage/format/cdi.c ucon64.dos/src/libdiscmage/format/cdi.c
  635. --- ucon64/src/libdiscmage/format/cdi.c 2015-12-16 01:47:52.000000000 +0100
  636. +++ ucon64.dos/src/libdiscmage/format/cdi.c 2016-02-21 00:29:45.745344929 +0100
  637. @@ -30,11 +30,11 @@
  638. #include <stdlib.h>
  639. #include <string.h>
  640. #include "../misc.h"
  641. -#include "../libdiscmage.h"
  642. -#include "../libdm_misc.h"
  643. +#include "../discmage.h"
  644. +#include "../libdmmis.h"
  645. #include "format.h"
  646. #ifdef DJGPP
  647. -#include "../dxedll_priv.h"
  648. +#include "../dxedllpr.h"
  649. #endif
  650. #if defined _MSC_VER && _MSC_VER >= 1900
  651. #pragma warning(pop)
  652. diff -Naur ucon64/src/libdiscmage/format/cue.c ucon64.dos/src/libdiscmage/format/cue.c
  653. --- ucon64/src/libdiscmage/format/cue.c 2015-12-16 01:47:58.000000000 +0100
  654. +++ ucon64.dos/src/libdiscmage/format/cue.c 2016-02-21 00:29:45.745344929 +0100
  655. @@ -26,11 +26,11 @@
  656. #include "../config.h"
  657. #endif
  658. #include "../misc.h"
  659. -#include "../libdiscmage.h"
  660. -#include "../libdm_misc.h"
  661. +#include "../discmage.h"
  662. +#include "../libdmmis.h"
  663. #include "format.h"
  664. #ifdef DJGPP
  665. -#include "../dxedll_priv.h"
  666. +#include "../dxedllpr.h"
  667. #endif
  668. #if defined _MSC_VER && _MSC_VER >= 1900
  669. #pragma warning(pop)
  670. diff -Naur ucon64/src/libdiscmage/format/format.c ucon64.dos/src/libdiscmage/format/format.c
  671. --- ucon64/src/libdiscmage/format/format.c 2015-12-16 01:47:41.000000000 +0100
  672. +++ ucon64.dos/src/libdiscmage/format/format.c 2016-02-21 00:29:45.745344929 +0100
  673. @@ -49,8 +49,8 @@
  674. #endif
  675. #endif
  676. #include "../misc.h"
  677. -#include "../libdiscmage.h"
  678. -#include "../libdm_misc.h"
  679. +#include "../discmage.h"
  680. +#include "../libdmmis.h"
  681. #include "format.h"
  682. #include "cdi.h"
  683. #include "cue.h"
  684. @@ -58,7 +58,7 @@
  685. #include "other.h"
  686. #include "toc.h"
  687. #ifdef DJGPP // DXEs are specific to DJGPP
  688. -#include "../dxedll_priv.h"
  689. +#include "../dxedllpr.h"
  690. #endif
  691. #if defined _MSC_VER && _MSC_VER >= 1900
  692. #pragma warning(pop)
  693. diff -Naur ucon64/src/libdiscmage/format/nero.c ucon64.dos/src/libdiscmage/format/nero.c
  694. --- ucon64/src/libdiscmage/format/nero.c 2015-12-16 01:47:46.000000000 +0100
  695. +++ ucon64.dos/src/libdiscmage/format/nero.c 2016-02-21 00:29:45.745344929 +0100
  696. @@ -30,11 +30,11 @@
  697. #include <stdlib.h>
  698. #include <string.h>
  699. #include "../misc.h"
  700. -#include "../libdiscmage.h"
  701. -#include "../libdm_misc.h"
  702. +#include "../discmage.h"
  703. +#include "../libdmmis.h"
  704. #include "format.h"
  705. #ifdef DJGPP
  706. -#include "../dxedll_priv.h"
  707. +#include "../dxedllpr.h"
  708. #endif
  709. #if defined _MSC_VER && _MSC_VER >= 1900
  710. #pragma warning(pop)
  711. diff -Naur ucon64/src/libdiscmage/format/other.c ucon64.dos/src/libdiscmage/format/other.c
  712. --- ucon64/src/libdiscmage/format/other.c 2015-12-16 01:48:09.000000000 +0100
  713. +++ ucon64.dos/src/libdiscmage/format/other.c 2016-02-21 00:29:45.745344929 +0100
  714. @@ -30,11 +30,11 @@
  715. #include <stdlib.h>
  716. #include <string.h>
  717. #include "../misc.h"
  718. -#include "../libdiscmage.h"
  719. -#include "../libdm_misc.h"
  720. +#include "../discmage.h"
  721. +#include "../libdmmis.h"
  722. #include "format.h"
  723. #ifdef DJGPP
  724. -#include "../dxedll_priv.h"
  725. +#include "../dxedllpr.h"
  726. #endif
  727. #if defined _MSC_VER && _MSC_VER >= 1900
  728. #pragma warning(pop)
  729. diff -Naur ucon64/src/libdiscmage/format/toc.c ucon64.dos/src/libdiscmage/format/toc.c
  730. --- ucon64/src/libdiscmage/format/toc.c 2015-12-16 01:48:03.000000000 +0100
  731. +++ ucon64.dos/src/libdiscmage/format/toc.c 2016-02-21 00:29:45.746344895 +0100
  732. @@ -26,11 +26,11 @@
  733. #include "../config.h"
  734. #endif
  735. #include "../misc.h"
  736. -#include "../libdiscmage.h"
  737. -#include "../libdm_misc.h"
  738. +#include "../discmage.h"
  739. +#include "../libdmmis.h"
  740. #include "format.h"
  741. #ifdef DJGPP
  742. -#include "../dxedll_priv.h"
  743. +#include "../dxedllpr.h"
  744. #endif
  745. #if defined _MSC_VER && _MSC_VER >= 1900
  746. #pragma warning(pop)
  747. diff -Naur ucon64/src/libdiscmage/libdm_misc.c ucon64.dos/src/libdiscmage/libdm_misc.c
  748. --- ucon64/src/libdiscmage/libdm_misc.c 2015-11-18 00:41:43.000000000 +0100
  749. +++ ucon64.dos/src/libdiscmage/libdm_misc.c 2016-02-21 00:29:45.746344895 +0100
  750. @@ -45,11 +45,11 @@
  751. #endif
  752. #endif
  753. #include "misc.h"
  754. -#include "libdiscmage.h"
  755. -#include "libdm_misc.h"
  756. +#include "discmage.h"
  757. +#include "libdmmis.h"
  758. #include "format/format.h"
  759. #ifdef DJGPP // DXEs are specific to DJGPP
  760. -#include "dxedll_priv.h"
  761. +#include "dxedllpr.h"
  762. #endif
  763. #include "misc_wav.h"
  764. diff -Naur ucon64/src/libdiscmage/Makefile.orig ucon64.dos/src/libdiscmage/Makefile.orig
  765. --- ucon64/src/libdiscmage/Makefile.orig 2016-02-11 01:39:03.000000000 +0100
  766. +++ ucon64.dos/src/libdiscmage/Makefile.orig 2016-02-21 00:29:45.746344895 +0100
  767. @@ -1,7 +1,7 @@
  768. .PHONY: all clean install
  769. DLOPEN=1
  770. -#USE_ZLIB=1
  771. +USE_ZLIB=1
  772. prefix=/usr/local
  773. exec_prefix=${prefix}
  774. @@ -38,7 +38,7 @@
  775. endif
  776. LIBNAME=discmage
  777. -OBJECTS=libdm_misc.o dllinit.o misc.o misc_wav.o format/format.o format/cdi.o \
  778. +OBJECTS=libdmmis.o dllinit.o misc.o misc_wav.o format/format.o format/cdi.o \
  779. format/nero.o format/cue.o format/toc.o format/other.o
  780. ifneq ($(OSTYPE),beos)
  781. LDFLAGS+=-lm
  782. @@ -227,30 +227,30 @@
  783. MISC_Z_H_DEPS=misc_z.h unzip.h
  784. MISC_H_DEPS=misc.h $(MISC_Z_H_DEPS) getopt.h
  785. -DXEDLL_PRIV_H_DEPS=dxedll_priv.h dxedll_pub.h
  786. +DXEDLL_PRIV_H_DEPS=dxedllpr.h dxedllpu.h
  787. -libdm_misc.o: config.h $(MISC_H_DEPS) libdiscmage.h libdm_misc.h \
  788. +libdm_misc.o: config.h $(MISC_H_DEPS) discmage.h libdmmis.h \
  789. format/format.h $(DXEDLL_PRIV_H_DEPS) misc_wav.h
  790. -dllinit.o: config.h libdiscmage.h dxedll_pub.h $(DXEDLL_PRIV_H_DEPS) map.h
  791. +dllinit.o: config.h discmage.h dxedllpu.h $(DXEDLL_PRIV_H_DEPS) map.h
  792. misc.o: config.h $(MISC_Z_H_DEPS) $(MISC_H_DEPS) $(DXEDLL_PRIV_H_DEPS)
  793. misc_wav.o: config.h $(MISC_H_DEPS) misc_wav.h
  794. -format/format.o: config.h $(MISC_H_DEPS) libdiscmage.h libdm_misc.h \
  795. +format/format.o: config.h $(MISC_H_DEPS) discmage.h libdmmis.h \
  796. format/format.h format/cdi.h format/cue.h format/nero.h \
  797. format/other.h format/toc.h $(DXEDLL_PRIV_H_DEPS)
  798. -format/cdi.o: config.h $(MISC_H_DEPS) libdiscmage.h libdm_misc.h \
  799. +format/cdi.o: config.h $(MISC_H_DEPS) discmage.h libdmmis.h \
  800. format/format.h $(DXEDLL_PRIV_H_DEPS)
  801. -format/nero.o: config.h $(MISC_H_DEPS) libdiscmage.h libdm_misc.h \
  802. +format/nero.o: config.h $(MISC_H_DEPS) discmage.h libdmmis.h \
  803. format/format.h $(DXEDLL_PRIV_H_DEPS)
  804. -format/cue.o: config.h $(MISC_H_DEPS) libdiscmage.h libdm_misc.h \
  805. +format/cue.o: config.h $(MISC_H_DEPS) discmage.h libdmmis.h \
  806. format/format.h $(DXEDLL_PRIV_H_DEPS)
  807. -format/toc.o: config.h $(MISC_H_DEPS) libdiscmage.h libdm_misc.h \
  808. +format/toc.o: config.h $(MISC_H_DEPS) discmage.h libdmmis.h \
  809. format/format.h $(DXEDLL_PRIV_H_DEPS)
  810. -format/other.o: config.h $(MISC_H_DEPS) libdiscmage.h libdm_misc.h \
  811. +format/other.o: config.h $(MISC_H_DEPS) discmage.h libdmmis.h \
  812. format/format.h $(DXEDLL_PRIV_H_DEPS)
  813. map.o: config.h map.h $(DXEDLL_PRIV_H_DEPS)
  814. misc_z.o: config.h $(MISC_Z_H_DEPS) $(MISC_H_DEPS) map.h unzip.h \
  815. $(DXEDLL_PRIV_H_DEPS)
  816. unzip.o: config.h unzip.h
  817. -dxe_misc.o: config.h dxedll_pub.h
  818. -djimport.o: config.h dlopen.h dxedll_pub.h libdiscmage.h
  819. -dlopen.o: config.h dlopen.h dxedll_pub.h map.h
  820. +dxe_misc.o: config.h dxedllpu.h
  821. +djimport.o: config.h dlopen.h dxedllpu.h discmage.h
  822. +dlopen.o: config.h dlopen.h dxedllpu.h map.h
  823. diff -Naur ucon64/src/libdiscmage/map.c ucon64.dos/src/libdiscmage/map.c
  824. --- ucon64/src/libdiscmage/map.c 2015-11-08 23:15:16.000000000 +0100
  825. +++ ucon64.dos/src/libdiscmage/map.c 2016-02-21 00:29:45.746344895 +0100
  826. @@ -23,7 +23,7 @@
  827. #include <string.h>
  828. #include "map.h"
  829. #if defined DJGPP && defined DLL
  830. -#include "dxedll_priv.h"
  831. +#include "dxedllpr.h"
  832. #endif
  833. diff -Naur ucon64/src/libdiscmage/misc.c ucon64.dos/src/libdiscmage/misc.c
  834. --- ucon64/src/libdiscmage/misc.c 2016-02-12 05:59:28.000000000 +0100
  835. +++ ucon64.dos/src/libdiscmage/misc.c 2016-02-21 00:29:45.747344860 +0100
  836. @@ -93,7 +93,7 @@
  837. #ifdef DJGPP
  838. #include <dpmi.h> // needed for __dpmi_int() by ansi_init()
  839. #ifdef DLL
  840. -#include "dxedll_priv.h"
  841. +#include "dxedllpr.h"
  842. #endif
  843. #endif
  844. diff -Naur ucon64/src/libdiscmage/misc_z.c ucon64.dos/src/libdiscmage/misc_z.c
  845. --- ucon64/src/libdiscmage/misc_z.c 2015-10-07 01:47:51.000000000 +0200
  846. +++ ucon64.dos/src/libdiscmage/misc_z.c 2016-02-21 00:29:45.747344860 +0100
  847. @@ -40,7 +40,7 @@
  848. #include "map.h"
  849. #include "unzip.h"
  850. #if defined DJGPP && defined DLL
  851. -#include "dxedll_priv.h"
  852. +#include "dxedllpr.h"
  853. #endif
  854. diff -Naur ucon64/src/Makefile ucon64.dos/src/Makefile
  855. --- ucon64/src/Makefile 2016-02-18 17:55:36.549034289 +0100
  856. +++ ucon64.dos/src/Makefile 2016-02-21 00:47:54.359635458 +0100
  857. @@ -36,7 +36,7 @@
  858. ifdef USE_DISCMAGE
  859. FULLLIBNAME_DM=$(LIBNAME_DM).dll
  860. ifndef DLOPEN
  861. -LDFLAGS+=libdiscmage/$(LIBNAME_DM).a
  862. +LDFLAGS+=discmage/$(LIBNAME_DM).a
  863. endif
  864. endif
  865. @@ -46,7 +46,7 @@
  866. ifdef USE_DISCMAGE
  867. FULLLIBNAME_DM=$(LIBNAME_DM).dxe
  868. ifndef DLOPEN
  869. -LDFLAGS+=libdiscmage/$(LIBNAME_DM).a
  870. +LDFLAGS+=discmage/$(LIBNAME_DM).a
  871. endif
  872. endif
  873. @@ -78,7 +78,7 @@
  874. else # DLOPEN
  875. ifdef USE_DISCMAGE # GNU specific: "simply expanded variable"
  876. FULLLIBNAME_DM:=$(addprefix lib,$(FULLLIBNAME_DM))
  877. -LDFLAGS+=-Llibdiscmage -l$(LIBNAME_DM)
  878. +LDFLAGS+=-Ldiscmage -l$(LIBNAME_DM)
  879. endif
  880. endif
  881. @@ -86,7 +86,7 @@
  882. endif # DJGPP
  883. endif # GCC_WIN
  884. -TARGETS+=libdiscmage/$(FULLLIBNAME_DM)
  885. +TARGETS+=discmage/$(FULLLIBNAME_DM)
  886. ifdef USE_LIBCD64
  887. @@ -95,7 +95,7 @@
  888. endif
  889. -OBJECTS=ucon64.o ucon64_dat.o ucon64_misc.o ucon64_opts.o \
  890. +OBJECTS=ucon64.o ucon64da.o ucon64mi.o ucon64op.o \
  891. misc/chksum.o misc/file.o misc/getopt2.o misc/misc.o misc/parallel.o \
  892. misc/property.o misc/string.o misc/term.o \
  893. console/atari.o console/coleco.o console/console.o console/dc.o \
  894. @@ -104,13 +104,13 @@
  895. console/nes.o console/ngp.o console/pce.o console/psx.o console/sms.o \
  896. console/snes.o console/swan.o console/vboy.o \
  897. backup/backup.o backup/cc2.o backup/cd64.o backup/cmc.o backup/dex.o \
  898. - backup/doctor64.o backup/doctor64jr.o backup/f2a.o backup/fal.o \
  899. + backup/doctor64.o backup/doctorjr.o backup/f2a.o backup/fal.o \
  900. backup/ffe.o backup/fig.o backup/gbx.o backup/gd.o \
  901. - backup/interceptor.o backup/lynxit.o backup/mccl.o backup/mcd.o \
  902. + backup/intercep.o backup/lynxit.o backup/mccl.o backup/mcd.o \
  903. backup/md-pro.o backup/mgd.o backup/msg.o backup/nfc.o \
  904. - backup/pce-pro.o backup/pl.o backup/psxpblib.o backup/quickdev16.o \
  905. + backup/pce-pro.o backup/pl.o backup/psxpblib.o backup/quickdev.o \
  906. backup/sc.o backup/sflash.o backup/smc.o backup/smd.o \
  907. - backup/smsgg-pro.o backup/spsc.o backup/ssc.o backup/swc.o \
  908. + backup/smsggpro.o backup/spsc.o backup/ssc.o backup/swc.o \
  909. backup/tototek.o backup/ufo.o backup/yoko.o backup/z64.o \
  910. patch/aps.o patch/bsl.o patch/gg.o patch/ips.o patch/patch.o patch/ppf.o
  911. ifneq ($(OSTYPE),cygwin)
  912. @@ -136,7 +136,7 @@
  913. endif # GCC_WIN
  914. endif # USE_ZLIB
  915. else
  916. -ifeq ($(GCC_WIN),1) # Cygwin/MinGW code in ucon64_misc needs dlopen code
  917. +ifeq ($(GCC_WIN),1) # Cygwin/MinGW code in ucon64mi needs dlopen code
  918. OBJECTS+=misc/dlopen.o
  919. endif # GCC_WIN
  920. endif # DLOPEN
  921. @@ -156,7 +156,7 @@
  922. CLEAN_CMD=rm -f $(TARGET) $(OBJECTS) *.core *.stackdump *~ */*~ */*/*~; \
  923. -cd libdiscmage && $(MAKE) clean; \
  924. +cd discmage && $(MAKE) clean; \
  925. cd ../backup/libcd64 && $(MAKE) clean
  926. clean:
  927. @@ -170,7 +170,7 @@
  928. del backup\*.o
  929. del misc\*.o
  930. del $(TARGET)
  931. - cd libdiscmage
  932. + cd discmage
  933. $(MAKE) clean
  934. cd ../backup/libcd64
  935. $(MAKE) clean
  936. @@ -182,7 +182,7 @@
  937. DISTCLEAN_CMD=rm -f config.mak config.log config.status config.cache config.h; \
  938. -cd libdiscmage && $(MAKE) distclean; \
  939. +cd discmage && $(MAKE) distclean; \
  940. cd ../backup/libcd64 && $(MAKE) clean
  941. # libcd64 Makefile has no distclean target
  942. @@ -196,7 +196,7 @@
  943. del config.status
  944. del config.cache
  945. del config.h
  946. - cd libdiscmage
  947. + cd discmage
  948. $(MAKE) distclean
  949. cd ../backup/libcd64
  950. $(MAKE) clean
  951. @@ -215,16 +215,16 @@
  952. ifdef USE_DISCMAGE
  953. -libdiscmage/$(FULLLIBNAME_DM):
  954. +discmage/$(FULLLIBNAME_DM):
  955. ifeq ($(GCC_WIN),1)
  956. - cd libdiscmage && $(MAKE)
  957. + cd discmage && $(MAKE)
  958. else
  959. ifdef DJGPP
  960. - cd libdiscmage
  961. + cd discmage
  962. $(MAKE)
  963. cd ..
  964. else
  965. - cd libdiscmage && $(MAKE)
  966. + cd discmage && $(MAKE)
  967. endif # DJGPP
  968. endif # GCC_WIN
  969. endif # USE_DISCMAGE
  970. @@ -270,7 +270,7 @@
  971. endif # msys
  972. endif # cygwin
  973. ifndef DLOPEN
  974. - cd libdiscmage && $(MAKE) install
  975. + cd discmage && $(MAKE) install
  976. endif
  977. @@ -290,7 +290,7 @@
  978. endif # msys
  979. endif # cygwin
  980. ifndef DLOPEN
  981. - cd libdiscmage && $(MAKE) uninstall
  982. + cd discmage && $(MAKE) uninstall
  983. endif
  984. @@ -302,11 +302,11 @@
  985. GETOPT2_H_DEPS=misc/getopt2.h misc/getopt.h
  986. MISC_H_DEPS=misc/misc.h misc/snprintf.h
  987. TERM_H_DEPS=misc/term.h misc/snprintf.h
  988. -UCON64_H_DEPS=ucon64.h misc/itypes.h ucon64_defines.h
  989. -UCON64_DAT_H_DEPS=ucon64_dat.h $(GETOPT2_H_DEPS) misc/itypes.h
  990. -UCON64_MISC_H_DEPS=ucon64_misc.h $(GETOPT2_H_DEPS) misc/itypes.h \
  991. - libdiscmage/libdiscmage.h
  992. -UCON64_OPTS_H_DEPS=ucon64_opts.h $(UCON64_H_DEPS)
  993. +UCON64_H_DEPS=ucon64.h misc/itypes.h ucon64de.h
  994. +UCON64_DAT_H_DEPS=ucon64da.h $(GETOPT2_H_DEPS) misc/itypes.h
  995. +UCON64_MISC_H_DEPS=ucon64mi.h $(GETOPT2_H_DEPS) misc/itypes.h \
  996. + discmage/discmage.h
  997. +UCON64_OPTS_H_DEPS=ucon64op.h $(UCON64_H_DEPS)
  998. CONSOLE_DEPS=$(GETOPT2_H_DEPS) $(UCON64_H_DEPS)
  999. CONSOLE_H_DEPS=console/console.h $(CONSOLE_DEPS)
  1000. SNES_H_DEPS=console/snes.h $(CONSOLE_DEPS) backup/fig.h
  1001. @@ -323,14 +323,14 @@
  1002. console/nes.h console/ngp.h console/pce.h console/psx.h \
  1003. console/sms.h $(SNES_H_DEPS) console/swan.h console/vboy.h \
  1004. backup/backup.h backup/cd64.h backup/cmc.h backup/dex.h \
  1005. - backup/doctor64.h backup/doctor64jr.h backup/f2a.h backup/fal.h \
  1006. + backup/doctor64.h backup/doctorjr.h backup/f2a.h backup/fal.h \
  1007. backup/gbx.h backup/gd.h backup/lynxit.h backup/mccl.h backup/mcd.h \
  1008. backup/md-pro.h backup/msg.h backup/pce-pro.h backup/pl.h \
  1009. - backup/quickdev16.h backup/sflash.h backup/smc.h backup/smd.h \
  1010. - backup/smsgg-pro.h backup/swc.h \
  1011. + backup/quickdev.h backup/sflash.h backup/smc.h backup/smd.h \
  1012. + backup/smsggpro.h backup/swc.h \
  1013. patch/aps.h patch/bsl.h patch/gg.h patch/ips.h patch/patch.h \
  1014. patch/ppf.h
  1015. -ucon64_dat.o: config.h $(ARCHIVE_H_DEPS) misc/file.h $(MISC_H_DEPS) \
  1016. +ucon64da.o: config.h $(ARCHIVE_H_DEPS) misc/file.h $(MISC_H_DEPS) \
  1017. misc/property.h misc/string.h $(UCON64_DAT_H_DEPS) \
  1018. $(UCON64_MISC_H_DEPS) \
  1019. console/atari.h console/coleco.h $(CONSOLE_H_DEPS) console/dc.h \
  1020. @@ -338,11 +338,11 @@
  1021. console/lynx.h console/n64.h console/neogeo.h console/nes.h \
  1022. console/ngp.h console/pce.h console/sms.h $(SNES_H_DEPS) \
  1023. console/swan.h console/vboy.h backup/backup.h
  1024. -ucon64_misc.o: config.h $(ARCHIVE_H_DEPS) $(BSWAP_H_DEPS) $(CHKSUM_H_DEPS) \
  1025. +ucon64mi.o: config.h $(ARCHIVE_H_DEPS) $(BSWAP_H_DEPS) $(CHKSUM_H_DEPS) \
  1026. misc/file.h $(MISC_H_DEPS) misc/property.h misc/string.h \
  1027. $(TERM_H_DEPS) $(UCON64_H_DEPS) $(UCON64_DAT_H_DEPS) \
  1028. $(UCON64_MISC_H_DEPS) misc/dlopen.h
  1029. -ucon64_opts.o: config.h $(ARCHIVE_H_DEPS) misc/file.h $(MISC_H_DEPS) \
  1030. +ucon64op.o: config.h $(ARCHIVE_H_DEPS) misc/file.h $(MISC_H_DEPS) \
  1031. misc/parallel.h misc/string.h $(UCON64_DAT_H_DEPS) \
  1032. $(UCON64_MISC_H_DEPS) $(UCON64_OPTS_H_DEPS) \
  1033. console/dc.h console/gb.h console/gba.h console/genesis.h \
  1034. @@ -350,11 +350,11 @@
  1035. console/nes.h console/pce.h console/sms.h $(SNES_H_DEPS) \
  1036. console/swan.h \
  1037. backup/backup.h backup/cd64.h backup/cmc.h backup/dex.h \
  1038. - backup/doctor64.h backup/doctor64jr.h backup/f2a.h backup/fal.h \
  1039. + backup/doctor64.h backup/doctorjr.h backup/f2a.h backup/fal.h \
  1040. backup/gbx.h backup/gd.h backup/lynxit.h backup/mccl.h \
  1041. backup/mcd.h backup/md-pro.h backup/msg.h backup/pce-pro.h \
  1042. - backup/pl.h backup/quickdev16.h backup/sflash.h backup/smc.h \
  1043. - backup/smd.h backup/smsgg-pro.h backup/swc.h \
  1044. + backup/pl.h backup/quickdev.h backup/sflash.h backup/smc.h \
  1045. + backup/smd.h backup/smsggpro.h backup/swc.h \
  1046. patch/aps.h patch/bsl.h patch/gg.h patch/ips.h patch/ppf.h
  1047. backup/backup.o: config.h backup/backup.h $(GETOPT2_H_DEPS)
  1048. backup/cc2.o: config.h $(UCON64_H_DEPS) backup/cc2.h $(GETOPT2_H_DEPS)
  1049. @@ -367,9 +367,9 @@
  1050. backup/dex.o: config.h $(ARCHIVE_H_DEPS) misc/file.h misc/parallel.h \
  1051. $(UCON64_H_DEPS) $(UCON64_MISC_H_DEPS) backup/dex.h \
  1052. backup/psxpblib.h $(GETOPT2_H_DEPS)
  1053. -backup/doctor64jr.o: config.h $(ARCHIVE_H_DEPS) misc/parallel.h \
  1054. +backup/doctorjr.o: config.h $(ARCHIVE_H_DEPS) misc/parallel.h \
  1055. $(UCON64_H_DEPS) $(UCON64_MISC_H_DEPS) \
  1056. - backup/doctor64jr.h $(GETOPT2_H_DEPS)
  1057. + backup/doctorjr.h $(GETOPT2_H_DEPS)
  1058. backup/doctor64.o: config.h $(ARCHIVE_H_DEPS) misc/file.h misc/parallel.h \
  1059. $(UCON64_H_DEPS) $(UCON64_MISC_H_DEPS) backup/doctor64.h \
  1060. $(GETOPT2_H_DEPS)
  1061. @@ -388,7 +388,7 @@
  1062. backup/gd.o: config.h $(ARCHIVE_H_DEPS) misc/file.h $(MISC_H_DEPS) \
  1063. misc/parallel.h misc/string.h $(TERM_H_DEPS) \
  1064. $(UCON64_MISC_H_DEPS) $(SNES_H_DEPS) backup/gd.h $(GETOPT2_H_DEPS)
  1065. -backup/interceptor.o: config.h backup/interceptor.h $(GETOPT2_H_DEPS)
  1066. +backup/intercep.o: config.h backup/intercep.h $(GETOPT2_H_DEPS)
  1067. backup/lynxit.o: config.h $(ARCHIVE_H_DEPS) misc/parallel.h $(TERM_H_DEPS) \
  1068. $(UCON64_MISC_H_DEPS) console/lynx.h backup/lynxit.h \
  1069. $(GETOPT2_H_DEPS)
  1070. @@ -413,9 +413,9 @@
  1071. backup/pl.o: config.h $(ARCHIVE_H_DEPS) misc/parallel.h $(UCON64_H_DEPS) \
  1072. $(UCON64_MISC_H_DEPS) backup/pl.h $(GETOPT2_H_DEPS)
  1073. backup/psxpblib.o: config.h misc/parallel.h $(UCON64_H_DEPS) backup/psxpblib.h
  1074. -backup/quickdev16.o: config.h $(ARCHIVE_H_DEPS) misc/itypes.h $(MISC_H_DEPS) \
  1075. +backup/quickdev.o: config.h $(ARCHIVE_H_DEPS) misc/itypes.h $(MISC_H_DEPS) \
  1076. $(TERM_H_DEPS) misc/usb.h $(UCON64_H_DEPS) \
  1077. - $(UCON64_MISC_H_DEPS) $(SNES_H_DEPS) backup/quickdev16.h
  1078. + $(UCON64_MISC_H_DEPS) $(SNES_H_DEPS) backup/quickdev.h
  1079. backup/sc.o: config.h backup/sc.h $(GETOPT2_H_DEPS)
  1080. backup/sflash.o: config.h $(ARCHIVE_H_DEPS) $(UCON64_H_DEPS) \
  1081. $(UCON64_MISC_H_DEPS) backup/tototek.h backup/sflash.h \
  1082. @@ -424,8 +424,8 @@
  1083. $(UCON64_MISC_H_DEPS) backup/ffe.h backup/smc.h $(GETOPT2_H_DEPS)
  1084. backup/smd.o: config.h $(ARCHIVE_H_DEPS) $(MISC_H_DEPS) $(UCON64_H_DEPS) \
  1085. $(UCON64_MISC_H_DEPS) backup/ffe.h backup/smd.h $(GETOPT2_H_DEPS)
  1086. -backup/smsgg-pro.o: config.h $(ARCHIVE_H_DEPS) $(UCON64_H_DEPS) \
  1087. - $(UCON64_MISC_H_DEPS) backup/tototek.h backup/smsgg-pro.h \
  1088. +backup/smsggpro.o: config.h $(ARCHIVE_H_DEPS) $(UCON64_H_DEPS) \
  1089. + $(UCON64_MISC_H_DEPS) backup/tototek.h backup/smsggpro.h \
  1090. $(GETOPT2_H_DEPS)
  1091. backup/spsc.o: config.h backup/spsc.h $(GETOPT2_H_DEPS)
  1092. backup/ssc.o: config.h backup/ssc.h $(GETOPT2_H_DEPS)
  1093. @@ -480,7 +480,7 @@
  1094. console/psx.o: config.h console/psx.h $(CONSOLE_DEPS)
  1095. console/sms.o: config.h $(ARCHIVE_H_DEPS) $(CHKSUM_H_DEPS) misc/file.h \
  1096. $(MISC_H_DEPS) misc/string.h $(UCON64_MISC_H_DEPS) \
  1097. - console/sms.h backup/mgd.h backup/smd.h backup/smsgg-pro.h \
  1098. + console/sms.h backup/mgd.h backup/smd.h backup/smsggpro.h \
  1099. $(CONSOLE_DEPS)
  1100. console/snes.o: config.h $(ARCHIVE_H_DEPS) $(BSWAP_H_DEPS) $(CHKSUM_H_DEPS) \
  1101. misc/file.h $(MISC_H_DEPS) misc/string.h $(UCON64_MISC_H_DEPS) \
  1102. @@ -493,7 +493,7 @@
  1103. $(CONSOLE_H_DEPS) console/vboy.h backup/backup.h
  1104. misc/archive.o: config.h $(ARCHIVE_H_DEPS) misc/map.h misc/unzip.h
  1105. misc/chksum.o: config.h $(BSWAP_H_DEPS) $(CHKSUM_H_DEPS) $(MISC_H_DEPS)
  1106. -misc/dlopen.o: config.h misc/dlopen.h misc/dxedll_pub.h misc/map.h
  1107. +misc/dlopen.o: config.h misc/dlopen.h misc/dxedllpu.h misc/map.h
  1108. misc/file.o: config.h $(ARCHIVE_H_DEPS) misc/file.h $(MISC_H_DEPS)
  1109. misc/getopt.o: config.h misc/getopt.h
  1110. misc/getopt2.o: config.h misc/file.h $(GETOPT2_H_DEPS)
  1111. @@ -505,7 +505,7 @@
  1112. misc/property.h misc/string.h
  1113. misc/snprintf.o: config.h
  1114. misc/string.o: config.h misc/string.h
  1115. -misc/term.o: config.h $(TERM_H_DEPS) ucon64_defines.h
  1116. +misc/term.o: config.h $(TERM_H_DEPS) ucon64de.h
  1117. misc/unzip.o: config.h misc/unzip.h
  1118. misc/usb.o: config.h misc/usb.h
  1119. patch/aps.o: config.h $(ARCHIVE_H_DEPS) $(BSWAP_H_DEPS) misc/file.h \
  1120. diff -Naur ucon64/src/misc/dlopen.c ucon64.dos/src/misc/dlopen.c
  1121. --- ucon64/src/misc/dlopen.c 2015-12-29 04:17:59.000000000 +0100
  1122. +++ ucon64.dos/src/misc/dlopen.c 2016-02-21 00:29:45.748344825 +0100
  1123. @@ -48,7 +48,7 @@
  1124. #ifdef DJGPP
  1125. -#include "misc/dxedll_pub.h"
  1126. +#include "misc/dxedllpu.h"
  1127. #include "misc/map.h"
  1128. diff -Naur ucon64/src/misc/term.c ucon64.dos/src/misc/term.c
  1129. --- ucon64/src/misc/term.c 2016-02-12 05:59:10.000000000 +0100
  1130. +++ ucon64.dos/src/misc/term.c 2016-02-21 00:29:45.748344825 +0100
  1131. @@ -51,7 +51,7 @@
  1132. #include <dpmi.h> // needed for __dpmi_int() by ansi_init()
  1133. #endif
  1134. #include "misc/term.h"
  1135. -#include "ucon64_defines.h"
  1136. +#include "ucon64de.h"
  1137. #if (defined __unix__ && !defined __MSDOS__) || defined __BEOS__ || \
  1138. diff -Naur ucon64/src/patch/aps.c ucon64.dos/src/patch/aps.c
  1139. --- ucon64/src/patch/aps.c 2015-12-09 01:56:31.000000000 +0100
  1140. +++ ucon64.dos/src/patch/aps.c 2016-02-21 00:29:45.749344791 +0100
  1141. @@ -32,7 +32,7 @@
  1142. #include "misc/file.h"
  1143. #include "misc/misc.h" // truncate()
  1144. #include "ucon64.h"
  1145. -#include "ucon64_misc.h"
  1146. +#include "ucon64mi.h"
  1147. #include "patch/aps.h"
  1148. diff -Naur ucon64/src/patch/bsl.c ucon64.dos/src/patch/bsl.c
  1149. --- ucon64/src/patch/bsl.c 2015-12-09 01:57:06.000000000 +0100
  1150. +++ ucon64.dos/src/patch/bsl.c 2016-02-21 00:29:45.749344791 +0100
  1151. @@ -24,7 +24,7 @@
  1152. #include "misc/archive.h"
  1153. #include "misc/file.h"
  1154. #include "ucon64.h"
  1155. -#include "ucon64_misc.h"
  1156. +#include "ucon64mi.h"
  1157. #include "patch/bsl.h"
  1158. diff -Naur ucon64/src/patch/gg.c ucon64.dos/src/patch/gg.c
  1159. --- ucon64/src/patch/gg.c 2016-02-18 17:36:14.893136171 +0100
  1160. +++ ucon64.dos/src/patch/gg.c 2016-02-21 00:29:45.749344791 +0100
  1161. @@ -51,7 +51,7 @@
  1162. #include "misc/archive.h"
  1163. #include "misc/file.h"
  1164. #include "misc/misc.h"
  1165. -#include "ucon64_misc.h"
  1166. +#include "ucon64mi.h"
  1167. #include "console/snes.h"
  1168. #include "patch/gg.h"
  1169. diff -Naur ucon64/src/patch/ips.c ucon64.dos/src/patch/ips.c
  1170. --- ucon64/src/patch/ips.c 2015-12-09 01:57:39.000000000 +0100
  1171. +++ ucon64.dos/src/patch/ips.c 2016-02-21 00:29:45.749344791 +0100
  1172. @@ -25,7 +25,7 @@
  1173. #include "misc/file.h"
  1174. #include "misc/misc.h"
  1175. #include "ucon64.h"
  1176. -#include "ucon64_misc.h"
  1177. +#include "ucon64mi.h"
  1178. #include "patch/ips.h"
  1179. diff -Naur ucon64/src/patch/patch.c ucon64.dos/src/patch/patch.c
  1180. --- ucon64/src/patch/patch.c 2015-12-09 01:58:16.000000000 +0100
  1181. +++ ucon64.dos/src/patch/patch.c 2016-02-21 00:29:45.749344791 +0100
  1182. @@ -19,7 +19,7 @@
  1183. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  1184. */
  1185. #include "ucon64.h"
  1186. -#include "ucon64_misc.h"
  1187. +#include "ucon64mi.h"
  1188. #include "patch/patch.h"
  1189. diff -Naur ucon64/src/patch/ppf.c ucon64.dos/src/patch/ppf.c
  1190. --- ucon64/src/patch/ppf.c 2015-12-09 01:59:01.000000000 +0100
  1191. +++ ucon64.dos/src/patch/ppf.c 2016-02-21 00:29:45.750344756 +0100
  1192. @@ -33,7 +33,7 @@
  1193. #include "misc/misc.h" // truncate()
  1194. #include "misc/string.h" // MEMCMP2_CASE
  1195. #include "ucon64.h"
  1196. -#include "ucon64_misc.h"
  1197. +#include "ucon64mi.h"
  1198. #include "patch/ppf.h"
  1199. diff -Naur ucon64/src/ucon64.c ucon64.dos/src/ucon64.c
  1200. --- ucon64/src/ucon64.c 2016-02-18 17:46:34.692739531 +0100
  1201. +++ ucon64.dos/src/ucon64.c 2016-02-21 00:29:45.750344756 +0100
  1202. @@ -60,9 +60,9 @@
  1203. #include "misc/property.h"
  1204. #include "misc/term.h"
  1205. #include "ucon64.h"
  1206. -#include "ucon64_dat.h"
  1207. -#include "ucon64_misc.h"
  1208. -#include "ucon64_opts.h"
  1209. +#include "ucon64da.h"
  1210. +#include "ucon64mi.h"
  1211. +#include "ucon64op.h"
  1212. #include "console/atari.h"
  1213. #include "console/coleco.h"
  1214. #include "console/console.h"
  1215. @@ -88,7 +88,7 @@
  1216. #include "backup/cmc.h"
  1217. #include "backup/dex.h"
  1218. #include "backup/doctor64.h"
  1219. -#include "backup/doctor64jr.h"
  1220. +#include "backup/doctorjr.h"
  1221. #include "backup/f2a.h"
  1222. #include "backup/fal.h"
  1223. #include "backup/gbx.h"
  1224. @@ -100,11 +100,11 @@
  1225. #include "backup/msg.h"
  1226. #include "backup/pce-pro.h"
  1227. #include "backup/pl.h"
  1228. -#include "backup/quickdev16.h"
  1229. +#include "backup/quickdev.h"
  1230. #include "backup/sflash.h"
  1231. #include "backup/smc.h"
  1232. #include "backup/smd.h"
  1233. -#include "backup/smsgg-pro.h"
  1234. +#include "backup/smsggpro.h"
  1235. #include "backup/swc.h"
  1236. #include "patch/aps.h"
  1237. #include "patch/bsl.h"
  1238. diff -Naur ucon64/src/ucon64_dat.c ucon64.dos/src/ucon64_dat.c
  1239. --- ucon64/src/ucon64_dat.c 2015-11-11 00:52:38.000000000 +0100
  1240. +++ ucon64.dos/src/ucon64_dat.c 2016-02-21 00:29:45.751344721 +0100
  1241. @@ -54,8 +54,8 @@
  1242. #include "misc/misc.h"
  1243. #include "misc/property.h"
  1244. #include "misc/string.h"
  1245. -#include "ucon64_dat.h"
  1246. -#include "ucon64_misc.h"
  1247. +#include "ucon64da.h"
  1248. +#include "ucon64mi.h"
  1249. #include "console/atari.h"
  1250. #include "console/coleco.h"
  1251. #include "console/console.h"
  1252. diff -Naur ucon64/src/ucon64.h ucon64.dos/src/ucon64.h
  1253. --- ucon64/src/ucon64.h 2015-11-23 01:24:44.000000000 +0100
  1254. +++ ucon64.dos/src/ucon64.h 2016-02-21 00:29:45.751344721 +0100
  1255. @@ -31,7 +31,7 @@
  1256. #endif
  1257. #include <stdio.h>
  1258. #include "misc/itypes.h"
  1259. -#include "ucon64_defines.h" // MAXBUFSIZE, etc..
  1260. +#include "ucon64de.h" // MAXBUFSIZE, etc..
  1261. #define UCON64_ISSET(x) (x != UCON64_UNKNOWN)
  1262. diff -Naur ucon64/src/ucon64_misc.c ucon64.dos/src/ucon64_misc.c
  1263. --- ucon64/src/ucon64_misc.c 2016-01-11 00:51:33.000000000 +0100
  1264. +++ ucon64.dos/src/ucon64_misc.c 2016-02-21 00:29:45.751344721 +0100
  1265. @@ -45,8 +45,8 @@
  1266. #include "misc/string.h"
  1267. #include "misc/term.h"
  1268. #include "ucon64.h"
  1269. -#include "ucon64_dat.h"
  1270. -#include "ucon64_misc.h"
  1271. +#include "ucon64da.h"
  1272. +#include "ucon64mi.h"
  1273. #ifdef USE_DISCMAGE
  1274. diff -Naur ucon64/src/ucon64_misc.h ucon64.dos/src/ucon64_misc.h
  1275. --- ucon64/src/ucon64_misc.h 2015-12-27 23:29:40.000000000 +0100
  1276. +++ ucon64.dos/src/ucon64_misc.h 2016-02-21 00:29:45.751344721 +0100
  1277. @@ -48,7 +48,7 @@
  1278. discmage_gauge gauge wrapper for libdiscmage
  1279. */
  1280. #ifdef USE_DISCMAGE
  1281. -#include "libdiscmage/libdiscmage.h" // dm_image_t
  1282. +#include "discmage/discmage.h" // dm_image_t
  1283. #define UCON64_DM_VERSION_MAJOR 0
  1284. #define UCON64_DM_VERSION_MINOR 0
  1285. diff -Naur ucon64/src/ucon64_opts.c ucon64.dos/src/ucon64_opts.c
  1286. --- ucon64/src/ucon64_opts.c 2016-02-18 19:51:27.442516500 +0100
  1287. +++ ucon64.dos/src/ucon64_opts.c 2016-02-21 00:29:45.752344687 +0100
  1288. @@ -41,9 +41,9 @@
  1289. #include "misc/misc.h"
  1290. #include "misc/parallel.h"
  1291. #include "misc/string.h"
  1292. -#include "ucon64_dat.h"
  1293. -#include "ucon64_misc.h"
  1294. -#include "ucon64_opts.h"
  1295. +#include "ucon64da.h"
  1296. +#include "ucon64mi.h"
  1297. +#include "ucon64op.h"
  1298. #include "console/dc.h"
  1299. #include "console/gb.h"
  1300. #include "console/gba.h"
  1301. @@ -62,7 +62,7 @@
  1302. #include "backup/cmc.h"
  1303. #include "backup/dex.h"
  1304. #include "backup/doctor64.h"
  1305. -#include "backup/doctor64jr.h"
  1306. +#include "backup/doctorjr.h"
  1307. #include "backup/f2a.h"
  1308. #include "backup/fal.h"
  1309. #include "backup/gbx.h"
  1310. @@ -74,11 +74,11 @@
  1311. #include "backup/msg.h"
  1312. #include "backup/pce-pro.h"
  1313. #include "backup/pl.h"
  1314. -#include "backup/quickdev16.h"
  1315. +#include "backup/quickdev.h"
  1316. #include "backup/sflash.h"
  1317. #include "backup/smc.h"
  1318. #include "backup/smd.h"
  1319. -#include "backup/smsgg-pro.h"
  1320. +#include "backup/smsggpro.h"
  1321. #include "backup/swc.h"
  1322. #include "patch/aps.h"
  1323. #include "patch/bsl.h"