Commit ea59125

Nick committed on
Causing more problems than it's worth so I'll do it later 
This reverts commit a7f85e449361df160cfe2ed7a31754381e765755.
commit ea59125399c338b25f2278f30ffa99864c78dee5 parent ef41b4b
22 changed files +72−49
Renamedemulation/PROCS.INC → Cpu/PROCS.INC +0−0
File metadata changed without textual changes.
Renamedemulation/TABLES.INC → Cpu/TABLES.INC +0−0
File metadata changed without textual changes.
Renamedemulation/machine.pas → Cpu/machine.pas +0−0
File metadata changed without textual changes.
Renamedemulation/z80cpu.pas → Cpu/z80cpu.pas +0−0
File metadata changed without textual changes.
ModifiedGBEmu.lpi +59−47
@@ -27,8 +27,8 @@
27 <Filename Value="Release\hUGETracker"/> 27 <Filename Value="Release\hUGETracker"/>
28 </Target> 28 </Target>
29 <SearchPaths> 29 <SearchPaths>
30 <IncludeFiles Value="$(ProjOutDir)"/> 30 <IncludeFiles Value="Cpu;Sound;Global;$(ProjOutDir)"/>
31 <OtherUnitFiles Value="emulation;forms;Pascal-SDL-2-Headers"/> 31 <OtherUnitFiles Value="Cpu;Sound;Global;Pascal-SDL-2-Headers"/>
32 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/> 32 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/>
33 </SearchPaths> 33 </SearchPaths>
34 <Parsing> 34 <Parsing>
@@ -86,8 +86,8 @@
86 <Filename Value="Release\hUGETracker"/> 86 <Filename Value="Release\hUGETracker"/>
87 </Target> 87 </Target>
88 <SearchPaths> 88 <SearchPaths>
89 <IncludeFiles Value="$(ProjOutDir)"/> 89 <IncludeFiles Value="Cpu;Sound;Global;$(ProjOutDir)"/>
90 <OtherUnitFiles Value="emulation;forms;Pascal-SDL-2-Headers"/> 90 <OtherUnitFiles Value="Cpu;Sound;Global;Pascal-SDL-2-Headers"/>
91 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/> 91 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/>
92 </SearchPaths> 92 </SearchPaths>
93 <Parsing> 93 <Parsing>
@@ -148,8 +148,8 @@
148 <Filename Value="Release\hUGETracker"/> 148 <Filename Value="Release\hUGETracker"/>
149 </Target> 149 </Target>
150 <SearchPaths> 150 <SearchPaths>
151 <IncludeFiles Value="$(ProjOutDir)"/> 151 <IncludeFiles Value="Cpu;Sound;Global;$(ProjOutDir)"/>
152 <OtherUnitFiles Value="emulation;forms;Pascal-SDL-2-Headers"/> 152 <OtherUnitFiles Value="Cpu;Sound;Global;Pascal-SDL-2-Headers"/>
153 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/> 153 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/>
154 </SearchPaths> 154 </SearchPaths>
155 <Parsing> 155 <Parsing>
@@ -236,114 +236,126 @@
236 <IsPartOfProject Value="True"/> 236 <IsPartOfProject Value="True"/>
237 </Unit0> 237 </Unit0>
238 <Unit1> 238 <Unit1>
239 <Filename Value="instruments.pas"/> 239 <Filename Value="Cpu\machine.pas"/>
240 <IsPartOfProject Value="True"/> 240 <IsPartOfProject Value="True"/>
241 </Unit1> 241 </Unit1>
242 <Unit2> 242 <Unit2>
243 <Filename Value="song.pas"/> 243 <Filename Value="Cpu\z80cpu.pas"/>
244 <IsPartOfProject Value="True"/> 244 <IsPartOfProject Value="True"/>
245 <UnitName Value="Song"/> 245 <UnitName Value="Z80CPU"/>
246 </Unit2> 246 </Unit2>
247 <Unit3> 247 <Unit3>
248 <Filename Value="utils.pas"/> 248 <Filename Value="Sound\sound.pas"/>
249 <IsPartOfProject Value="True"/> 249 <IsPartOfProject Value="True"/>
250 <UnitName Value="Utils"/>
251 </Unit3> 250 </Unit3>
252 <Unit4> 251 <Unit4>
253 <Filename Value="constants.pas"/> 252 <Filename Value="Global\vars.pas"/>
254 <IsPartOfProject Value="True"/> 253 <IsPartOfProject Value="True"/>
255 <UnitName Value="Constants"/>
256 </Unit4> 254 </Unit4>
257 <Unit5> 255 <Unit5>
258 <Filename Value="waves.pas"/> 256 <Filename Value="mainloop.pas"/>
259 <IsPartOfProject Value="True"/> 257 <IsPartOfProject Value="True"/>
260 <UnitName Value="Waves"/>
261 </Unit5> 258 </Unit5>
262 <Unit6> 259 <Unit6>
263 <Filename Value="trackergrid.pas"/> 260 <Filename Value="tracker.pas"/>
264 <IsPartOfProject Value="True"/> 261 <IsPartOfProject Value="True"/>
265 <UnitName Value="TrackerGrid"/> 262 <ComponentName Value="frmTracker"/>
263 <HasResources Value="True"/>
264 <ResourceBaseClass Value="Form"/>
265 <UnitName Value="Tracker"/>
266 </Unit6> 266 </Unit6>
267 <Unit7> 267 <Unit7>
268 <Filename Value="clipboardutils.pas"/> 268 <Filename Value="instruments.pas"/>
269 <IsPartOfProject Value="True"/> 269 <IsPartOfProject Value="True"/>
270 <UnitName Value="ClipboardUtils"/>
271 </Unit7> 270 </Unit7>
272 <Unit8> 271 <Unit8>
273 <Filename Value="hugedatatypes.pas"/> 272 <Filename Value="song.pas"/>
274 <IsPartOfProject Value="True"/> 273 <IsPartOfProject Value="True"/>
275 <UnitName Value="HugeDatatypes"/> 274 <UnitName Value="Song"/>
276 </Unit8> 275 </Unit8>
277 <Unit9> 276 <Unit9>
278 <Filename Value="codegen.pas"/> 277 <Filename Value="utils.pas"/>
279 <IsPartOfProject Value="True"/> 278 <IsPartOfProject Value="True"/>
280 <UnitName Value="Codegen"/> 279 <UnitName Value="Utils"/>
281 </Unit9> 280 </Unit9>
282 <Unit10> 281 <Unit10>
283 <Filename Value="symparser.pas"/> 282 <Filename Value="constants.pas"/>
284 <IsPartOfProject Value="True"/> 283 <IsPartOfProject Value="True"/>
285 <UnitName Value="SymParser"/> 284 <UnitName Value="Constants"/>
286 </Unit10> 285 </Unit10>
287 <Unit11> 286 <Unit11>
288 <Filename Value="modimport.pas"/> 287 <Filename Value="waves.pas"/>
289 <IsPartOfProject Value="True"/> 288 <IsPartOfProject Value="True"/>
290 <UnitName Value="MODImport"/> 289 <UnitName Value="Waves"/>
291 </Unit11> 290 </Unit11>
292 <Unit12> 291 <Unit12>
293 <Filename Value="keymap.pas"/> 292 <Filename Value="about_hugetracker.pas"/>
294 <IsPartOfProject Value="True"/> 293 <IsPartOfProject Value="True"/>
295 <UnitName Value="Keymap"/> 294 <ComponentName Value="frmAboutHugetracker"/>
295 <HasResources Value="True"/>
296 <ResourceBaseClass Value="Form"/>
296 </Unit12> 297 </Unit12>
297 <Unit13> 298 <Unit13>
298 <Filename Value="hugesettings.pas"/> 299 <Filename Value="trackergrid.pas"/>
299 <IsPartOfProject Value="True"/> 300 <IsPartOfProject Value="True"/>
300 <UnitName Value="hUGESettings"/> 301 <UnitName Value="TrackerGrid"/>
301 </Unit13> 302 </Unit13>
302 <Unit14> 303 <Unit14>
303 <Filename Value="emulation\mainloop.pas"/> 304 <Filename Value="clipboardutils.pas"/>
304 <IsPartOfProject Value="True"/> 305 <IsPartOfProject Value="True"/>
306 <UnitName Value="ClipboardUtils"/>
305 </Unit14> 307 </Unit14>
306 <Unit15> 308 <Unit15>
307 <Filename Value="emulation\sound.pas"/> 309 <Filename Value="hugedatatypes.pas"/>
308 <IsPartOfProject Value="True"/> 310 <IsPartOfProject Value="True"/>
311 <UnitName Value="HugeDatatypes"/>
309 </Unit15> 312 </Unit15>
310 <Unit16> 313 <Unit16>
311 <Filename Value="emulation\vars.pas"/> 314 <Filename Value="codegen.pas"/>
312 <IsPartOfProject Value="True"/> 315 <IsPartOfProject Value="True"/>
316 <UnitName Value="Codegen"/>
313 </Unit16> 317 </Unit16>
314 <Unit17> 318 <Unit17>
315 <Filename Value="emulation\z80cpu.pas"/> 319 <Filename Value="symparser.pas"/>
316 <IsPartOfProject Value="True"/> 320 <IsPartOfProject Value="True"/>
317 <UnitName Value="Z80CPU"/> 321 <UnitName Value="SymParser"/>
318 </Unit17> 322 </Unit17>
319 <Unit18> 323 <Unit18>
320 <Filename Value="emulation\machine.pas"/> 324 <Filename Value="effecteditor.pas"/>
321 <IsPartOfProject Value="True"/> 325 <IsPartOfProject Value="True"/>
326 <ComponentName Value="frmEffectEditor"/>
327 <HasResources Value="True"/>
328 <ResourceBaseClass Value="Form"/>
322 </Unit18> 329 </Unit18>
323 <Unit19> 330 <Unit19>
324 <Filename Value="forms\about_hugetracker.pas"/> 331 <Filename Value="options.pas"/>
325 <IsPartOfProject Value="True"/> 332 <IsPartOfProject Value="True"/>
333 <ComponentName Value="frmOptions"/>
326 <HasResources Value="True"/> 334 <HasResources Value="True"/>
335 <ResourceBaseClass Value="Form"/>
327 </Unit19> 336 </Unit19>
328 <Unit20> 337 <Unit20>
329 <Filename Value="forms\effecteditor.pas"/> 338 <Filename Value="rendertowave.pas"/>
330 <IsPartOfProject Value="True"/> 339 <IsPartOfProject Value="True"/>
340 <ComponentName Value="frmRenderToWave"/>
331 <HasResources Value="True"/> 341 <HasResources Value="True"/>
342 <ResourceBaseClass Value="Form"/>
343 <UnitName Value="RenderToWave"/>
332 </Unit20> 344 </Unit20>
333 <Unit21> 345 <Unit21>
334 <Filename Value="forms\options.pas"/> 346 <Filename Value="modimport.pas"/>
335 <IsPartOfProject Value="True"/> 347 <IsPartOfProject Value="True"/>
336 <HasResources Value="True"/> 348 <UnitName Value="MODImport"/>
337 </Unit21> 349 </Unit21>
338 <Unit22> 350 <Unit22>
339 <Filename Value="forms\rendertowave.pas"/> 351 <Filename Value="keymap.pas"/>
340 <IsPartOfProject Value="True"/> 352 <IsPartOfProject Value="True"/>
341 <HasResources Value="True"/> 353 <UnitName Value="Keymap"/>
342 </Unit22> 354 </Unit22>
343 <Unit23> 355 <Unit23>
344 <Filename Value="forms\tracker.pas"/> 356 <Filename Value="hugesettings.pas"/>
345 <IsPartOfProject Value="True"/> 357 <IsPartOfProject Value="True"/>
346 <HasResources Value="True"/> 358 <UnitName Value="hUGESettings"/>
347 </Unit23> 359 </Unit23>
348 </Units> 360 </Units>
349 </ProjectOptions> 361 </ProjectOptions>
@@ -351,8 +363,8 @@
351 <Version Value="11"/> 363 <Version Value="11"/>
352 <PathDelim Value="\"/> 364 <PathDelim Value="\"/>
353 <SearchPaths> 365 <SearchPaths>
354 <IncludeFiles Value="$(ProjOutDir)"/> 366 <IncludeFiles Value="CPU;Sound;Global;$(ProjOutDir)"/>
355 <OtherUnitFiles Value="emulation;forms;Pascal-SDL-2-Headers"/> 367 <OtherUnitFiles Value="CPU;Sound;Global;Pascal-SDL-2-Headers"/>
356 <UnitOutputDirectory Value="lib\Development\$(TargetCPU)-$(TargetOS)"/> 368 <UnitOutputDirectory Value="lib\Development\$(TargetCPU)-$(TargetOS)"/>
357 </SearchPaths> 369 </SearchPaths>
358 <Parsing> 370 <Parsing>
ModifiedGBEmu.lpr +13−1
@@ -26,7 +26,14 @@ uses
26 26
27 Forms, 27 Forms,
28 Interfaces, 28 Interfaces,
29 machine, mainloop, sound, vars, Z80CPU; 29 Tracker in 'Tracker.pas',
30 EffectEditor in 'effecteditor.pas',
31 Z80CPU in 'CPU\z80cpu.pas',
32 sound in 'Sound\sound.pas',
33 vars in 'Global\vars.pas',
34 options in 'options.pas',
35 about_hugetracker in 'about_hugetracker.pas',
36 rendertowave in 'rendertowave.pas';
30 37
31 {$R *.res} 38 {$R *.res}
32 39
@@ -68,5 +75,10 @@ begin
68 Application.Scaled:=True; 75 Application.Scaled:=True;
69 Application.Title:='hUGETracker'; 76 Application.Title:='hUGETracker';
70 Application.Initialize; 77 Application.Initialize;
78 Application.CreateForm(TfrmTracker, frmTracker);
79 Application.CreateForm(TfrmAboutHugeTracker, frmAboutHugetracker);
80 Application.CreateForm(TfrmEffectEditor, frmEffectEditor);
81 Application.CreateForm(TfrmRenderToWave, frmRenderToWave);
82 Application.CreateForm(TfrmOptions, frmOptions);
71 Application.Run; 83 Application.Run;
72 end. 84 end.
Renamedemulation/vars.pas → Global/vars.pas +0−0
File metadata changed without textual changes.
Renamedemulation/sound.pas → Sound/sound.pas +0−0
File metadata changed without textual changes.
Renamedforms/about_hugetracker.lfm → about_hugetracker.lfm +0−0
File metadata changed without textual changes.
Renamedforms/about_hugetracker.pas → about_hugetracker.pas +0−0
File metadata changed without textual changes.
Renamedforms/effecteditor.lfm → effecteditor.lfm +0−0
File metadata changed without textual changes.
Renamedforms/effecteditor.pas → effecteditor.pas +0−0
File metadata changed without textual changes.
Renamedemulation/mainloop.pas → mainloop.pas +0−0
File metadata changed without textual changes.
Renamedforms/options.lfm → options.lfm +0−0
File metadata changed without textual changes.
Renamedforms/options.pas → options.pas +0−0
File metadata changed without textual changes.
Renamedforms/rendertowave.lfm → rendertowave.lfm +0−0
File metadata changed without textual changes.
Renamedforms/rendertowave.pas → rendertowave.pas +0−0
File metadata changed without textual changes.
Renamedforms/tracker.lfm → tracker.lfm +0−0
File metadata changed without textual changes.
Renamedforms/tracker.pas → tracker.pas +0−0
File metadata changed without textual changes.
Renameduge2source/uge2source.lpi → uge2source.lpi +0−0
File metadata changed without textual changes.
Renameduge2source/uge2source.lpr → uge2source.lpr +0−0
File metadata changed without textual changes.
Deleteduge2source/README.md +0−1
@@ -1 +0,0 @@
1 # uge2source