Commit 27a9471

Nick committed on
Adding linux build mode
commit 27a9471992357e79b7c44cc1e716930b73cae759 parent 53bbd34
5 changed files +94−35
ModifiedGBEmu.lpi +63−5
@@ -1,11 +1,13 @@
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <CONFIG> 2 <CONFIG>
3 <ProjectOptions> 3 <ProjectOptions>
4 <Version Value="11"/> 4 <Version Value="12"/>
5 <PathDelim Value="\"/> 5 <PathDelim Value="\"/>
6 <General> 6 <General>
7 <Flags>
8 <CompatibilityMode Value="True"/>
9 </Flags>
7 <SessionStorage Value="InProjectDir"/> 10 <SessionStorage Value="InProjectDir"/>
8 <MainUnit Value="0"/>
9 <Title Value="hUGETracker"/> 11 <Title Value="hUGETracker"/>
10 <Scaled Value="True"/> 12 <Scaled Value="True"/>
11 <ResourceType Value="res"/> 13 <ResourceType Value="res"/>
@@ -17,7 +19,7 @@
17 </XPManifest> 19 </XPManifest>
18 <Icon Value="0"/> 20 <Icon Value="0"/>
19 </General> 21 </General>
20 <BuildModes Count="2"> 22 <BuildModes Count="3">
21 <Item1 Name="Development" Default="True"/> 23 <Item1 Name="Development" Default="True"/>
22 <Item2 Name="Production"> 24 <Item2 Name="Production">
23 <CompilerOptions> 25 <CompilerOptions>
@@ -63,6 +65,63 @@
63 </Other> 65 </Other>
64 </CompilerOptions> 66 </CompilerOptions>
65 </Item2> 67 </Item2>
68 <Item3 Name="Production Linux">
69 <CompilerOptions>
70 <Version Value="11"/>
71 <PathDelim Value="\"/>
72 <Target>
73 <Filename Value="Release\hUGETracker"/>
74 </Target>
75 <SearchPaths>
76 <IncludeFiles Value="GPU;CPU;Sound;Global;$(ProjOutDir)"/>
77 <Libraries Value="linuxlibs"/>
78 <OtherUnitFiles Value="CPU;Sound;Global;Pascal-SDL-2-Headers"/>
79 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/>
80 </SearchPaths>
81 <Parsing>
82 <SyntaxOptions>
83 <CStyleOperator Value="False"/>
84 <CPPInline Value="False"/>
85 </SyntaxOptions>
86 </Parsing>
87 <CodeGeneration>
88 <SmartLinkUnit Value="True"/>
89 <TargetCPU Value="i386"/>
90 <TargetOS Value="linux"/>
91 <Optimizations>
92 <OptimizationLevel Value="4"/>
93 </Optimizations>
94 </CodeGeneration>
95 <Linking>
96 <Debugging>
97 <GenerateDebugInfo Value="False"/>
98 <UseLineInfoUnit Value="False"/>
99 <StripSymbols Value="True"/>
100 </Debugging>
101 <LinkSmart Value="True"/>
102 <Options>
103 <Win32>
104 <GraphicApplication Value="True"/>
105 </Win32>
106 </Options>
107 </Linking>
108 <Other>
109 <Verbosity>
110 <ShoLineNum Value="True"/>
111 <ShowAll Value="True"/>
112 <ShowDebugInfo Value="True"/>
113 <ShowUsedFiles Value="True"/>
114 <ShowTriedFiles Value="True"/>
115 <ShowCompProc Value="True"/>
116 <ShowCond Value="True"/>
117 <ShowExecInfo Value="True"/>
118 <ShowHintsForUnusedUnitsInMainSrc Value="True"/>
119 <ShowHintsForSenderNotUsed Value="True"/>
120 </Verbosity>
121 <CustomOptions Value="-dBorland -dVer150 -dDelphi7 -dCompiler6_Up -dPUREPASCAL -CfAVX2 -CpCOREAVX2 OpCOREAVX2 -Si -Sv"/>
122 </Other>
123 </CompilerOptions>
124 </Item3>
66 </BuildModes> 125 </BuildModes>
67 <PublishOptions> 126 <PublishOptions>
68 <Version Value="2"/> 127 <Version Value="2"/>
@@ -235,8 +294,7 @@
235 </SyntaxOptions> 294 </SyntaxOptions>
236 </Parsing> 295 </Parsing>
237 <CodeGeneration> 296 <CodeGeneration>
238 <TargetCPU Value="i386"/> 297 <TargetCPU Value="x86_64"/>
239 <TargetOS Value="win32"/>
240 <Optimizations> 298 <Optimizations>
241 <OptimizationLevel Value="0"/> 299 <OptimizationLevel Value="0"/>
242 </Optimizations> 300 </Optimizations>
ModifiedGBEmu.lpr +5−4
@@ -3,6 +3,11 @@ program GBEmu;
3 {$MODE Delphi} 3 {$MODE Delphi}
4 4
5 uses 5 uses
6 {$ifdef unix}
7 cthreads,
8 cmem, // the c memory manager is on some systems much faster for multi-threading
9 {$endif}
10
6 {$ifdef MSWINDOWS} 11 {$ifdef MSWINDOWS}
7 windows, 12 windows,
8 {$endif} 13 {$endif}
@@ -15,10 +20,6 @@ uses
15 // font includes here 20 // font includes here
16 {$endif} 21 {$endif}
17 22
18 {$ifdef unix}
19 cthreads,
20 cmem, // the c memory manager is on some systems much faster for multi-threading
21 {$endif}
22 Forms, 23 Forms,
23 Interfaces, 24 Interfaces,
24 Tracker in 'Tracker.pas', 25 Tracker in 'Tracker.pas',
Modifiedtracker.lfm +25−25
@@ -16,7 +16,7 @@ object frmTracker: TfrmTracker
16 OnShow = FormShow 16 OnShow = FormShow
17 Position = poDefault 17 Position = poDefault
18 ShowHint = True 18 ShowHint = True
19 LCLVersion = '2.0.6.0' 19 LCLVersion = '2.1.0.0'
20 object TreeView1: TTreeView 20 object TreeView1: TTreeView
21 Left = 0 21 Left = 0
22 Height = 820 22 Height = 820
@@ -1859,8 +1859,8 @@ object frmTracker: TfrmTracker
1859 end 1859 end
1860 object MainMenu1: TMainMenu 1860 object MainMenu1: TMainMenu
1861 Images = ImageList1 1861 Images = ImageList1
1862 left = 616 1862 Left = 616
1863 top = 75 1863 Top = 75
1864 object MenuItem1: TMenuItem 1864 object MenuItem1: TMenuItem
1865 Caption = 'File' 1865 Caption = 'File'
1866 object MenuItem12: TMenuItem 1866 object MenuItem12: TMenuItem
@@ -1960,8 +1960,8 @@ object frmTracker: TfrmTracker
1960 end 1960 end
1961 object ActionList1: TActionList 1961 object ActionList1: TActionList
1962 Images = ImageList1 1962 Images = ImageList1
1963 left = 999 1963 Left = 999
1964 top = 75 1964 Top = 75
1965 object FileOpen1: TFileOpen 1965 object FileOpen1: TFileOpen
1966 Category = 'File' 1966 Category = 'File'
1967 Caption = '&Open ...' 1967 Caption = '&Open ...'
@@ -2064,8 +2064,8 @@ object frmTracker: TfrmTracker
2064 end 2064 end
2065 end 2065 end
2066 object ImageList1: TImageList 2066 object ImageList1: TImageList
2067 left = 233 2067 Left = 233
2068 top = 81 2068 Top = 81
2069 Bitmap = { 2069 Bitmap = {
2070 4C694E0000001000000010000000000000000000000000000000000000000000 2070 4C694E0000001000000010000000000000000000000000000000000000000000
2071 0000000000000000000000000000000000000000000000000000000000000000 2071 0000000000000000000000000000000000000000000000000000000000000000
@@ -4568,17 +4568,17 @@ object frmTracker: TfrmTracker
4568 end 4568 end
4569 object OpenDialog1: TOpenDialog 4569 object OpenDialog1: TOpenDialog
4570 Filter = 'hUGETracker Instruments|*.ugi' 4570 Filter = 'hUGETracker Instruments|*.ugi'
4571 left = 737 4571 Left = 737
4572 top = 75 4572 Top = 75
4573 end 4573 end
4574 object InstrumentSaveDialog: TSaveDialog 4574 object InstrumentSaveDialog: TSaveDialog
4575 Filter = 'hUGETracker Instruments|*.ugi' 4575 Filter = 'hUGETracker Instruments|*.ugi'
4576 left = 600 4576 Left = 600
4577 top = 177 4577 Top = 177
4578 end 4578 end
4579 object OrderEditPopup: TPopupMenu 4579 object OrderEditPopup: TPopupMenu
4580 left = 376 4580 Left = 376
4581 top = 81 4581 Top = 81
4582 object MenuItem17: TMenuItem 4582 object MenuItem17: TMenuItem
4583 Caption = 'Insert new row' 4583 Caption = 'Insert new row'
4584 Hint = 'Insert a new row filled with brand new patterns' 4584 Hint = 'Insert a new row filled with brand new patterns'
@@ -4609,8 +4609,8 @@ object frmTracker: TfrmTracker
4609 object ImageList2: TImageList 4609 object ImageList2: TImageList
4610 Height = 32 4610 Height = 32
4611 Width = 32 4611 Width = 32
4612 left = 233 4612 Left = 233
4613 top = 168 4613 Top = 168
4614 Bitmap = { 4614 Bitmap = {
4615 4C69020000002000000020000000000000000000000000000000000000000000 4615 4C69020000002000000020000000000000000000000000000000000000000000
4616 0000000000000000000000000000000000000000000000000000000000000000 4616 0000000000000000000000000000000000000000000000000000000000000000
@@ -4874,28 +4874,28 @@ object frmTracker: TfrmTracker
4874 object OscilloscopeUpdateTimer: TTimer 4874 object OscilloscopeUpdateTimer: TTimer
4875 Interval = 25 4875 Interval = 25
4876 OnTimer = OscilloscopeUpdateTimerTimer 4876 OnTimer = OscilloscopeUpdateTimerTimer
4877 left = 504 4877 Left = 504
4878 top = 81 4878 Top = 81
4879 end 4879 end
4880 object GBSSaveDialog: TSaveDialog 4880 object GBSSaveDialog: TSaveDialog
4881 Filter = 'Gameboy Soundtrack|*.gbs' 4881 Filter = 'Gameboy Soundtrack|*.gbs'
4882 left = 920 4882 Left = 920
4883 top = 177 4883 Top = 177
4884 end 4884 end
4885 object WaveSaveDialog: TSaveDialog 4885 object WaveSaveDialog: TSaveDialog
4886 Filter = 'hUGETracker Waves|*.ugw' 4886 Filter = 'hUGETracker Waves|*.ugw'
4887 left = 784 4887 Left = 784
4888 top = 168 4888 Top = 168
4889 end 4889 end
4890 object GBSaveDialog: TSaveDialog 4890 object GBSaveDialog: TSaveDialog
4891 Filter = 'Gameboy ROM|*.GB' 4891 Filter = 'Gameboy ROM|*.GB'
4892 left = 457 4892 Left = 457
4893 top = 184 4893 Top = 184
4894 end 4894 end
4895 object NoteHaltTimer: TTimer 4895 object NoteHaltTimer: TTimer
4896 Enabled = False 4896 Enabled = False
4897 OnTimer = NoteHaltTimerTimer 4897 OnTimer = NoteHaltTimerTimer
4898 left = 345 4898 Left = 345
4899 top = 177 4899 Top = 177
4900 end 4900 end
4901 end 4901 end
Modifiedtracker.pas +1−1
@@ -974,7 +974,7 @@ begin
974 974
975 if not NotesToFreqs.TryGetData(Note, Freq) then Exit; 975 if not NotesToFreqs.TryGetData(Note, Freq) then Exit;
976 976
977 PreviewInstrument(Freq, InstrumentNumberSpinner.Value); 977 PreviewInstrument(Freq, InstrumentComboBox.ItemIndex-1);
978 PreviewingInstrument := Note; 978 PreviewingInstrument := Note;
979 end; 979 end;
980 980