Skip to content

Commit c0297df

Browse files
ruckertmruckertm
committed
moving the custom build step to the INPUT file adding MMIX_LOAD_FILE_LOC
1 parent f2c08c5 commit c0297df

9 files changed

+131
-68
lines changed

‎customizecpu.vcproj

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -185,27 +185,39 @@
185185
>
186186
<Tool
187187
Name="VCCustomBuildTool"
188-
Description="copying libconfig.cpu"
189-
CommandLine="copy $(InputDir)libconfig.cpu $(InputDir)libconfig.h"
190-
AdditionalDependencies="$(InputDir)libconfig.cpu"
191-
Outputs="$(InputDir)libconfig.h"
192188
/>
193189
</FileConfiguration>
194190
<FileConfiguration
195191
Name="Release|Win32"
196192
>
197193
<Tool
198194
Name="VCCustomBuildTool"
199-
Description="copying libconfig.cpu"
200-
CommandLine="copy $(InputDir)libconfig.cpu $(InputDir)libconfig.h"
201-
AdditionalDependencies="$(InputDir)libconfig.cpu"
202-
Outputs="$(InputDir)libconfig.h"
203195
/>
204196
</FileConfiguration>
205197
</File>
206198
<File
207199
RelativePath="..\mmixlib\libconfig.cpu"
208200
>
201+
<FileConfiguration
202+
Name="Debug|Win32"
203+
>
204+
<Tool
205+
Name="VCCustomBuildTool"
206+
Description="copy libconfig.cpu to libconfig.h"
207+
CommandLine="copy $(InputDir)libconfig.cpu $(InputDir)libconfig.h"
208+
Outputs="$(InputDir)libconfig.h"
209+
/>
210+
</FileConfiguration>
211+
<FileConfiguration
212+
Name="Release|Win32"
213+
>
214+
<Tool
215+
Name="VCCustomBuildTool"
216+
Description="copy libconfig.cpu to libconfig.h"
217+
CommandLine="copy $(InputDir)libconfig.cpu $(InputDir)libconfig.h"
218+
Outputs="$(InputDir)libconfig.h"
219+
/>
220+
</FileConfiguration>
209221
</File>
210222
<File
211223
RelativePath="..\mmixlib\libimport.h"
@@ -215,27 +227,39 @@
215227
>
216228
<Tool
217229
Name="VCCustomBuildTool"
218-
Description="copying libimport.cpu"
219-
CommandLine="copy $(InputDir)libimport.cpu $(InputDir)libimport.h&#x0D;&#x0A;"
220-
AdditionalDependencies="$(InputDir)libimport.cpu"
221-
Outputs="$(InputDir)libimport.h"
222230
/>
223231
</FileConfiguration>
224232
<FileConfiguration
225233
Name="Release|Win32"
226234
>
227235
<Tool
228236
Name="VCCustomBuildTool"
229-
Description="copying libimport.cpu"
230-
CommandLine="copy $(InputDir)libimport.cpu $(InputDir)libimport.h&#x0D;&#x0A;"
231-
AdditionalDependencies="$(InputDir)libimport.cpu"
232-
Outputs="$(InputDir)libimport.h"
233237
/>
234238
</FileConfiguration>
235239
</File>
236240
<File
237241
RelativePath="..\mmixlib\libimport.cpu"
238242
>
243+
<FileConfiguration
244+
Name="Debug|Win32"
245+
>
246+
<Tool
247+
Name="VCCustomBuildTool"
248+
Description="copy libimport.cpu to libimport.h"
249+
CommandLine="copy $(InputDir)libimport.cpu $(InputDir)libimport.h"
250+
Outputs="$(InputDir)libimport.h"
251+
/>
252+
</FileConfiguration>
253+
<FileConfiguration
254+
Name="Release|Win32"
255+
>
256+
<Tool
257+
Name="VCCustomBuildTool"
258+
Description="copy libimport.cpu to libimport.h"
259+
CommandLine="copy $(InputDir)libimport.cpu $(InputDir)libimport.h"
260+
Outputs="$(InputDir)libimport.h"
261+
/>
262+
</FileConfiguration>
239263
</File>
240264
</Filter>
241265
<Filter

‎customizegdb.vcproj

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -185,27 +185,39 @@
185185
>
186186
<Tool
187187
Name="VCCustomBuildTool"
188-
Description="copying libconfig.gdb"
189-
CommandLine="copy $(InputDir)libconfig.gdb $(InputDir)libconfig.h"
190-
AdditionalDependencies="$(InputDir)libconfig.gdb"
191-
Outputs="$(InputDir)libconfig.h"
192188
/>
193189
</FileConfiguration>
194190
<FileConfiguration
195191
Name="Release|Win32"
196192
>
197193
<Tool
198194
Name="VCCustomBuildTool"
199-
Description="copying libconfig.gdb"
200-
CommandLine="copy $(InputDir)libconfig.gdb $(InputDir)libconfig.h"
201-
AdditionalDependencies="$(InputDir)libconfig.gdb"
202-
Outputs="$(InputDir)libconfig.h"
203195
/>
204196
</FileConfiguration>
205197
</File>
206198
<File
207199
RelativePath="..\mmixlib\libconfig.gdb"
208200
>
201+
<FileConfiguration
202+
Name="Debug|Win32"
203+
>
204+
<Tool
205+
Name="VCCustomBuildTool"
206+
Description="copy libconfig.gdb to libconfig.h"
207+
CommandLine="copy $(InputDir)libconfig.gdb $(InputDir)libconfig.h"
208+
Outputs="$(InputDir)libconfig.h"
209+
/>
210+
</FileConfiguration>
211+
<FileConfiguration
212+
Name="Release|Win32"
213+
>
214+
<Tool
215+
Name="VCCustomBuildTool"
216+
Description="copy libconfig.gdb to libconfig.h"
217+
CommandLine="copy $(InputDir)libconfig.gdb $(InputDir)libconfig.h"
218+
Outputs="$(InputDir)libconfig.h"
219+
/>
220+
</FileConfiguration>
209221
</File>
210222
<File
211223
RelativePath="..\mmixlib\libimport.h"
@@ -215,27 +227,39 @@
215227
>
216228
<Tool
217229
Name="VCCustomBuildTool"
218-
Description="copying libimport.gdb"
219-
CommandLine="copy $(InputDir)libimport.gdb $(InputDir)libimport.h&#x0D;&#x0A;"
220-
AdditionalDependencies="$(InputDir)libimport.gdb"
221-
Outputs="$(InputDir)libimport.h"
222230
/>
223231
</FileConfiguration>
224232
<FileConfiguration
225233
Name="Release|Win32"
226234
>
227235
<Tool
228236
Name="VCCustomBuildTool"
229-
Description="copying libimport.gdb"
230-
CommandLine="copy $(InputDir)libimport.gdb $(InputDir)libimport.h&#x0D;&#x0A;"
231-
AdditionalDependencies="$(InputDir)libimport.gdb"
232-
Outputs="$(InputDir)libimport.h"
233237
/>
234238
</FileConfiguration>
235239
</File>
236240
<File
237241
RelativePath="..\mmixlib\libimport.gdb"
238242
>
243+
<FileConfiguration
244+
Name="Debug|Win32"
245+
>
246+
<Tool
247+
Name="VCCustomBuildTool"
248+
Description="copy libimport.gdb to libimport.h"
249+
CommandLine="copy $(InputDir)libimport.gdb $(InputDir)libimport.h"
250+
Outputs="$(InputDir)libimport.h"
251+
/>
252+
</FileConfiguration>
253+
<FileConfiguration
254+
Name="Release|Win32"
255+
>
256+
<Tool
257+
Name="VCCustomBuildTool"
258+
Description="copy libimport.gdb to libimport.h"
259+
CommandLine="copy $(InputDir)libimport.gdb $(InputDir)libimport.h"
260+
Outputs="$(InputDir)libimport.h"
261+
/>
262+
</FileConfiguration>
239263
</File>
240264
</Filter>
241265
<Filter

‎customizeide.vcproj

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -185,27 +185,39 @@
185185
>
186186
<Tool
187187
Name="VCCustomBuildTool"
188-
Description="copying libconfig.ide"
189-
CommandLine="copy $(InputDir)libconfig.ide $(InputDir)libconfig.h"
190-
AdditionalDependencies="$(InputDir)libconfig.ide"
191-
Outputs="$(InputDir)libconfig.h"
192188
/>
193189
</FileConfiguration>
194190
<FileConfiguration
195191
Name="Release|Win32"
196192
>
197193
<Tool
198194
Name="VCCustomBuildTool"
199-
Description="copying libconfig.ide"
200-
CommandLine="copy $(InputDir)libconfig.ide $(InputDir)libconfig.h"
201-
AdditionalDependencies="$(InputDir)libconfig.ide"
202-
Outputs="$(InputDir)libconfig.h"
203195
/>
204196
</FileConfiguration>
205197
</File>
206198
<File
207199
RelativePath="..\mmixlib\libconfig.ide"
208200
>
201+
<FileConfiguration
202+
Name="Debug|Win32"
203+
>
204+
<Tool
205+
Name="VCCustomBuildTool"
206+
Description="copy libconfig.ide to libconfig.h"
207+
CommandLine="copy $(InputDir)libconfig.ide $(InputDir)libconfig.h"
208+
Outputs="$(InputDir)libconfig.h"
209+
/>
210+
</FileConfiguration>
211+
<FileConfiguration
212+
Name="Release|Win32"
213+
>
214+
<Tool
215+
Name="VCCustomBuildTool"
216+
Description="copy libconfig.ide to libconfig.h"
217+
CommandLine="copy $(InputDir)libconfig.ide $(InputDir)libconfig.h"
218+
Outputs="$(InputDir)libconfig.h"
219+
/>
220+
</FileConfiguration>
209221
</File>
210222
<File
211223
RelativePath="..\mmixlib\libimport.h"
@@ -215,27 +227,39 @@
215227
>
216228
<Tool
217229
Name="VCCustomBuildTool"
218-
Description="copying libimport.ide"
219-
CommandLine="copy $(InputDir)libimport.ide $(InputDir)libimport.h&#x0D;&#x0A;"
220-
AdditionalDependencies="$(InputDir)libimport.ide"
221-
Outputs="$(InputDir)libimport.h"
222230
/>
223231
</FileConfiguration>
224232
<FileConfiguration
225233
Name="Release|Win32"
226234
>
227235
<Tool
228236
Name="VCCustomBuildTool"
229-
Description="copying libimport.ide"
230-
CommandLine="copy $(InputDir)libimport.ide $(InputDir)libimport.h&#x0D;&#x0A;"
231-
AdditionalDependencies="$(InputDir)libimport.ide"
232-
Outputs="$(InputDir)libimport.h"
233237
/>
234238
</FileConfiguration>
235239
</File>
236240
<File
237241
RelativePath="..\mmixlib\libimport.ide"
238242
>
243+
<FileConfiguration
244+
Name="Debug|Win32"
245+
>
246+
<Tool
247+
Name="VCCustomBuildTool"
248+
Description="copy libimport.ide to libimport.h"
249+
CommandLine="copy $(InputDir)libimport.ide $(InputDir)libimport.h"
250+
Outputs="$(InputDir)libimport.h"
251+
/>
252+
</FileConfiguration>
253+
<FileConfiguration
254+
Name="Release|Win32"
255+
>
256+
<Tool
257+
Name="VCCustomBuildTool"
258+
Description="copy libimport.ide to libimport.h"
259+
CommandLine="copy $(InputDir)libimport.ide $(InputDir)libimport.h"
260+
Outputs="$(InputDir)libimport.h"
261+
/>
262+
</FileConfiguration>
239263
</File>
240264
</Filter>
241265
<Filter

‎customizevd.vcproj

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -185,21 +185,13 @@
185185
>
186186
<Tool
187187
Name="VCCustomBuildTool"
188-
Description=""
189-
CommandLine=""
190-
AdditionalDependencies=""
191-
Outputs=""
192188
/>
193189
</FileConfiguration>
194190
<FileConfiguration
195191
Name="Release|Win32"
196192
>
197193
<Tool
198194
Name="VCCustomBuildTool"
199-
Description=""
200-
CommandLine=""
201-
AdditionalDependencies=""
202-
Outputs=""
203195
/>
204196
</FileConfiguration>
205197
</File>
@@ -235,21 +227,13 @@
235227
>
236228
<Tool
237229
Name="VCCustomBuildTool"
238-
Description="copying libimport.vd"
239-
CommandLine="copy $(InputDir)libimport.vd $(InputDir)libimport.h&#x0D;&#x0A;"
240-
AdditionalDependencies="$(InputDir)libimport.vd"
241-
Outputs="$(InputDir)libimport.h"
242230
/>
243231
</FileConfiguration>
244232
<FileConfiguration
245233
Name="Release|Win32"
246234
>
247235
<Tool
248236
Name="VCCustomBuildTool"
249-
Description="copying libimport.vd"
250-
CommandLine="copy $(InputDir)libimport.vd $(InputDir)libimport.h&#x0D;&#x0A;"
251-
AdditionalDependencies="$(InputDir)libimport.vd"
252-
Outputs="$(InputDir)libimport.h"
253237
/>
254238
</FileConfiguration>
255239
</File>

‎libconfig.cpu

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,7 @@
9696

9797
/* define this to record file line and location associations while assembling */
9898
#define MMIXAL_LINE_LOC(file_no,line_no,cur_loc)
99+
/* define this to record file line and location associations while loading mmo files */
100+
#define MMIX_LOAD_LINE_LOC(file_no,line_no,cur_loc)
99101

100102
#endif

‎libconfig.gdb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,7 @@
9696

9797
/* define this to record file line and location associations while assembling */
9898
#define MMIXAL_LINE_LOC(file_no,line_no,cur_loc)
99+
/* define this to record file line and location associations while loading mmo files */
100+
#define MMIX_LOAD_LINE_LOC(file_no,line_no,cur_loc)
99101

100102
#endif

‎libconfig.ide

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ extern int mmix_fputc(int c, FILE *f);
110110
/* define this to record file line and location associations while assembling */
111111
#define MMIXAL_LINE_LOC(file_no,line_no,cur_loc) add_line_loc(file_no,line_no,cur_loc)
112112

113-
/* define this to record file line and location associations while loading mmo files
114-
undefine to get the default behaviour of recording this info in the mem_tetra */
113+
/* define this to record file line and location associations while loading mmo files */
115114
#define MMIX_LOAD_LINE_LOC(file_no,line_no,cur_loc) add_line_loc(file_no,line_no,cur_loc)
116115

117116
#endif

‎libconfig.plain

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,6 @@ extern int mmix_fputc(int c, FILE *f);
8686

8787
/* define this to record file line and location associations while assembling */
8888
#define MMIXAL_LINE_LOC(file_no,line_no,cur_loc)
89-
89+
/* define this to record file line and location associations while loading mmo files */
90+
#define MMIX_LOAD_LINE_LOC(file_no,line_no,cur_loc)
9091
#endif

‎libimport.ide

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@
55

66
extern void win32_log(char *msg);
77
extern void win32_ferror(int line, char *format, char *str);
8-
extern void win32_message(char *msg);
8+
extern void win32_message(char *msg);
9+
10+
extern void add_line_loc(int file_no, int line_no, octa loc);
11+
/* report the association of a file/line with a location */

0 commit comments

Comments
 (0)