dosbuild.patch 51 KB

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