Previous 15994 Revisions Next

r8345 Tuesday 29th June, 2010 at 09:06:30 UTC by Miodrag Milanović
Made tools compile again (except messtest), this requires full clean build.
[src/emu]devcpu.c devcpu.h devlegcy.h sound.c sound.h timer.c timer.h video.c video.h
[src/emu/machine]eeprom.c eeprom.h z80ctc.c z80ctc.h z80dart.c z80dart.h z80dma.c z80dma.h z80pio.c z80pio.h z80sio.c z80sio.h z80sti.c z80sti.h
[src/emu/sound]okim6295.c okim6295.h
[src/mess/tools]tools.mak
[src/mess/tools/castool]castool.mak
[src/mess/tools/imgtool]imgtool.mak
[src/mess/tools/imgtool/modules]mac.c
[src/mess/tools/imgtool/windows]assoc.c assocdlg.c attrdlg.c hexview.c secview.c wimgtool.c wmain.c

src/emu/video.c
r8344r8345
25642564#define BILINEAR_FILTER      1
25652565
25662566#include "rendersw.c"
2567
2568const device_type SCREEN = screen_device_config::static_alloc_device_config;
src/emu/video.h
r8344r8345
272272
273273
274274// device type definition
275const device_type SCREEN = screen_device_config::static_alloc_device_config;
275extern const device_type SCREEN;
276276
277277
278278
src/emu/sound/okim6295.c
r8344r8345
529529      }
530530   }
531531}
532
533const device_type SOUND_OKIM6295 = okim6295_device_config::static_alloc_device_config;
src/emu/sound/okim6295.h
r8344r8345
171171
172172
173173// device type definition
174const device_type SOUND_OKIM6295 = okim6295_device_config::static_alloc_device_config;
174extern const device_type SOUND_OKIM6295;
175175
176176
177177
src/emu/devlegcy.h
r8344r8345
199199   virtual device_t *alloc_device(running_machine &machine) const;          \
200200};                                                            \
201201                                                            \
202const device_type name = configclass::static_alloc_device_config
202extern const device_type name
203203
204204// macro for defining the implementation needed for configuration and device classes
205205#define _DEFINE_LEGACY_DEVICE(name, basename, configclass, deviceclass, baseconfigclass, basedeviceclass)      \
r8344r8345
222222device_t *configclass::alloc_device(running_machine &machine) const          \
223223{                                                            \
224224   return pool_alloc(machine_get_pool(machine), deviceclass(machine, *this));   \
225}
225}                                                            \
226const device_type name = configclass::static_alloc_device_config
226227
227228// reduced macros that are easier to use, and map to the above two macros
228229#define DECLARE_LEGACY_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_device_config_base, legacy_device_base)
src/emu/devcpu.c
r8344r8345
576576   else if (m_string_export != NULL)
577577      (*m_string_export)(this, entry, string);
578578}
579
580const device_type CPU = legacy_cpu_device_config::static_alloc_device_config;
src/emu/devcpu.h
r8344r8345
467467   address_space_config m_space_config[3];            // array of address space configs
468468};
469469
470const device_type CPU = legacy_cpu_device_config::static_alloc_device_config;
470extern const device_type CPU;
471471
472472
473473
src/emu/machine/z80dma.c
r8344r8345
898898WRITE_LINE_DEVICE_HANDLER( z80dma_rdy_w ) { downcast<z80dma_device *>(device)->rdy_w(state); }
899899WRITE_LINE_DEVICE_HANDLER( z80dma_wait_w ) { downcast<z80dma_device *>(device)->wait_w(state); }
900900WRITE_LINE_DEVICE_HANDLER( z80dma_bai_w ) { downcast<z80dma_device *>(device)->bai_w(state); }
901
902const device_type Z80DMA = z80dma_device_config::static_alloc_device_config;
src/emu/machine/z80dma.h
r8344r8345
185185
186186
187187// device type definition
188const device_type Z80DMA = z80dma_device_config::static_alloc_device_config;
188extern const device_type Z80DMA;
189189
190190
191191
src/emu/machine/z80pio.c
r8344r8345
878878
879879   BIT(offset, 0) ? z80pio_c_w(device, index, data) : z80pio_d_w(device, index, data);
880880}
881
882const device_type Z80PIO = z80pio_device_config::static_alloc_device_config;
src/emu/machine/z80pio.h
r8344r8345
207207
208208
209209// device type definition
210const device_type Z80PIO = z80pio_device_config::static_alloc_device_config;
210extern const device_type Z80PIO;
211211
212212
213213
src/emu/machine/z80sti.c
r8344r8345
779779WRITE_LINE_DEVICE_HANDLER( z80sti_i5_w ) { downcast<z80sti_device *>(device)->gpip_input(5, state); }
780780WRITE_LINE_DEVICE_HANDLER( z80sti_i6_w ) { downcast<z80sti_device *>(device)->gpip_input(6, state); }
781781WRITE_LINE_DEVICE_HANDLER( z80sti_i7_w ) { downcast<z80sti_device *>(device)->gpip_input(7, state); }
782
783const device_type Z80STI = z80sti_device_config::static_alloc_device_config;
src/emu/machine/z80sti.h
r8344r8345
203203
204204
205205// device type definition
206const device_type Z80STI = z80sti_device_config::static_alloc_device_config;
206extern const device_type Z80STI;
207207
208208
209209
src/emu/machine/z80dart.c
r8344r8345
14051405   else
14061406      z80dart_d_w(device, channel, data);
14071407}
1408
1409const device_type Z80DART = z80dart_device_config::static_alloc_device_config;
src/emu/machine/z80dart.h
r8344r8345
267267
268268
269269// device type definition
270const device_type Z80DART = z80dart_device_config::static_alloc_device_config;
270extern const device_type Z80DART;
271271/*
272272#define Z8470   DEVICE_GET_INFO_NAME(z8470)
273273#define LH0081  DEVICE_GET_INFO_NAME(lh0088)
src/emu/machine/eeprom.c
r8344r8345
572572   return (*cmd==0);
573573}
574574
575const device_type EEPROM = eeprom_device_config::static_alloc_device_config;
src/emu/machine/eeprom.h
r8344r8345
156156
157157
158158// device type definition
159const device_type EEPROM = eeprom_device_config::static_alloc_device_config;
159extern const device_type EEPROM;
160160
161161
162162
src/emu/machine/z80sio.c
r8344r8345
896896      case 3: z80sio_c_w(device, 1, data); break;
897897   }
898898}
899
900const device_type Z80SIO = z80sio_device_config::static_alloc_device_config;
src/emu/machine/z80sio.h
r8344r8345
164164
165165
166166// device type definition
167const device_type Z80SIO = z80sio_device_config::static_alloc_device_config;
167extern const device_type Z80SIO;
168168
169169
170170
src/emu/machine/z80ctc.c
r8344r8345
559559WRITE_LINE_DEVICE_HANDLER( z80ctc_trg1_w ) { downcast<z80ctc_device *>(device)->trigger(1, state); }
560560WRITE_LINE_DEVICE_HANDLER( z80ctc_trg2_w ) { downcast<z80ctc_device *>(device)->trigger(2, state); }
561561WRITE_LINE_DEVICE_HANDLER( z80ctc_trg3_w ) { downcast<z80ctc_device *>(device)->trigger(3, state); }
562
563const device_type Z80CTC = z80ctc_device_config::static_alloc_device_config;
src/emu/machine/z80ctc.h
r8344r8345
158158
159159
160160// device type definition
161const device_type Z80CTC = z80ctc_device_config::static_alloc_device_config;
161extern const device_type Z80CTC;
162162
163163
164164
src/emu/sound.c
r8344r8345
821821   speaker_device *speaker = index_to_input(machine, index, inputnum);
822822   return (speaker != NULL) ? speaker->input_name(inputnum) : 0;
823823}
824
825const device_type SPEAKER = speaker_device_config::static_alloc_device_config;
src/emu/sound.h
r8344r8345
125125
126126
127127// device type definition
128const device_type SPEAKER = speaker_device_config::static_alloc_device_config;
128extern const device_type SPEAKER;
129129
130130
131131
src/emu/timer.c
r8344r8345
11691169   // adjust the timer
11701170   timer_adjust_oneshot(m_timer, m_screen->time_until_pos(next_vpos), 0);
11711171}
1172
1173const device_type TIMER = timer_device_config::static_alloc_device_config;
src/emu/timer.h
r8344r8345
335335
336336
337337// device type definition
338const device_type TIMER = timer_device_config::static_alloc_device_config;
338extern const device_type TIMER;
339339
340340
341341#endif   /* __TIMER_H__ */
src/mess/tools/castool/castool.mak
r8344r8345
3434   $(EMUOBJ)/emucore.o               \
3535   $(EMUOBJ)/emuopts.o             \
3636   $(EMUOBJ)/memory.o               \
37   $(EMUOBJ)/ioprocs.o         \
3738   $(MESSOBJ)/utils.o               \
38   $(MESSOBJ)/opresolv.o            \
3939   $(MESS_FORMATS)/a26_cas.o           \
4040   $(MESS_FORMATS)/apf_apt.o           \
4141   $(MESS_FORMATS)/cbm_tap.o           \
r8344r8345
6262   $(MESS_FORMATS)/vg5k_cas.o          \
6363   $(MESS_FORMATS)/vt_cas.o            \
6464   $(MESS_FORMATS)/zx81_p.o          \
65   $(MESS_FORMATS)/ioprocs.o         \
6665   $(MESS_FORMATS)/cassimg.o         \
6766   $(MESS_FORMATS)/wavfile.o         \
6867
src/mess/tools/tools.mak
r8344r8345
1414MESS_TOOLS = $(MESSOBJ)/tools
1515
1616
17ifdef BUILD_IMGTOOL
18include $(MESSSRC)/tools/imgtool/imgtool.mak
19TOOLS += $(IMGTOOL)
20endif
1721
18ifdef BUILD_MESSTEST
19include $(MESSSRC)/tools/messtest/messtest.mak
20TOOLS += $(MESSTEST)
22ifdef BUILD_CASTOOL
23include $(MESSSRC)/tools/castool/castool.mak
24TOOLS += $(CASTOOL)
2125endif
2226
27#ifdef BUILD_MESSTEST
28#include $(MESSSRC)/tools/messtest/messtest.mak
29#TOOLS += $(MESSTEST)
30#endif
31
2332ifdef BUILD_DAT2HTML
2433include $(MESSSRC)/tools/dat2html/dat2html.mak
2534TOOLS += $(DAT2HTML)
r8344r8345
3342include $(MESSSRC)/tools/imgtool/windows/wimgtool.mak
3443TOOLS += $(WIMGTOOL)
3544endif
36endif
45endif
No newline at end of file
src/mess/tools/imgtool/imgtool.mak
r8344r8345
3737   $(EMUOBJ)/emuopts.o             \
3838   $(EMUOBJ)/memory.o            \
3939   $(MESSOBJ)/utils.o            \
40   $(MESSOBJ)/opresolv.o            \
41   $(MESS_FORMATS)/ioprocs.o         \
40   $(EMUOBJ)/ioprocs.o         \
41   $(EMUOBJ)/image.o         \
4242   $(MESS_FORMATS)/flopimg.o         \
4343   $(MESS_FORMATS)/cassimg.o         \
4444   $(MESS_FORMATS)/basicdsk.o         \
src/mess/tools/imgtool/windows/assocdlg.c
r8344r8345
1717#include "wimgres.h"
1818#include "strconv.h"
1919#include "../imgtool.h"
20#include "utils.h"
2021
2122
2223//============================================================
src/mess/tools/imgtool/windows/attrdlg.c
r8344r8345
1#define WIN32_LEAN_AND_MEAN   
12#include <windows.h>
23#include <windowsx.h>
34#include <commctrl.h>
5#include <commdlg.h>
46
7
58#include "attrdlg.h"
69#include "wimgres.h"
710#include "opcntrl.h"
src/mess/tools/imgtool/windows/wimgtool.c
r8344r8345
33//  wimgtool.c - Win32 GUI Imgtool
44//
55//============================================================
6
6// standard windows headers
7#define WIN32_LEAN_AND_MEAN
8#define _WIN32_IE 0x0501
79#include <windows.h>
810#include <windowsx.h>
11#include <shellapi.h>
912#include <commctrl.h>
13#include <commdlg.h>
14#include <wingdi.h>
15
16// standard C headers
17#include <stdio.h>
18#include <ctype.h>
19#include <io.h>
20#include <fcntl.h>
21#include <dlgs.h>
22#include <string.h>
23#include <sys/stat.h>
24#include <time.h>
1025#include <tchar.h>
11#include <ctype.h>
1226
1327#include "emu.h"
1428#include "wimgtool.h"
src/mess/tools/imgtool/windows/secview.c
r8344r8345
33//  secview.c - A Win32 sector editor dialog
44//
55//============================================================
6
6#define WIN32_LEAN_AND_MEAN
77#ifndef _WIN32_WINNT
88#define _WIN32_WINNT 0x400
99#endif
src/mess/tools/imgtool/windows/assoc.c
r8344r8345
1#define WIN32_LEAN_AND_MEAN
12#include <windows.h>
23#include <tchar.h>
34#include <ctype.h>
src/mess/tools/imgtool/windows/wmain.c
r8344r8345
33//  wmain.h - Win32 GUI Imgtool main code
44//
55//============================================================
6
6#define WIN32_LEAN_AND_MEAN
77#include <windows.h>
88#include <commctrl.h>
99
r8344r8345
1313#include "../modules.h"
1414#include "winutf8.h"
1515#include "strconv.h"
16#include "utils.h"
1617
1718int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
1819   LPWSTR command_line_w, int cmd_show)
src/mess/tools/imgtool/windows/hexview.c
r8344r8345
33//  hexview.c - A Win32 hex editor control
44//
55//============================================================
6
6#define WIN32_LEAN_AND_MEAN
7#include <windows.h>
8#include <windowsx.h>
9#include <shellapi.h>
10#include <commctrl.h>
11#include <commdlg.h>
712#include "winutils.h"
813#include <stdio.h>
914#include <tchar.h>
src/mess/tools/imgtool/modules/mac.c
r8344r8345
9494#include <stddef.h>
9595
9696#include "emu.h"
97#include "utils.h"
9798#include "osdepend.h"
9899#include "imgtoolx.h"
99100#include "macutil.h"

Previous 15994 Revisions Next

© 1998-2018 The MESS Team