From 87e38fd1d30e53413bc1f94f0dfd340051a71253 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 15 Feb 2015 09:07:58 +1100 Subject: [PATCH] Remove redundant filename prefix --- src/osd/modules/debugger/debugosx.m | 4 +-- ...osxbreakpointsview.h => breakpointsview.h} | 3 +- ...osxbreakpointsview.m => breakpointsview.m} | 2 +- .../{debugosxconsoleview.h => consoleview.h} | 3 +- .../{debugosxconsoleview.m => consoleview.m} | 2 +- ...commandhistory.h => debugcommandhistory.h} | 0 ...commandhistory.m => debugcommandhistory.m} | 2 +- ...{debugosxdebugconsole.h => debugconsole.h} | 3 +- ...{debugosxdebugconsole.m => debugconsole.m} | 20 ++++++------- .../osx/{debugosxdebugview.h => debugview.h} | 0 .../osx/{debugosxdebugview.m => debugview.m} | 2 +- ...ugwindowhandler.h => debugwindowhandler.h} | 0 ...ugwindowhandler.m => debugwindowhandler.m} | 6 ++-- ...osxdisassemblyview.h => disassemblyview.h} | 3 +- ...osxdisassemblyview.m => disassemblyview.m} | 2 +- ...isassemblyviewer.h => disassemblyviewer.h} | 3 +- ...isassemblyviewer.m => disassemblyviewer.m} | 6 ++-- ...{debugosxerrorlogview.h => errorlogview.h} | 3 +- ...{debugosxerrorlogview.m => errorlogview.m} | 2 +- ...ugosxerrorlogviewer.h => errorlogviewer.h} | 3 +- ...ugosxerrorlogviewer.m => errorlogviewer.m} | 4 +-- .../{debugosxmemoryview.h => memoryview.h} | 3 +- .../{debugosxmemoryview.m => memoryview.m} | 2 +- ...{debugosxmemoryviewer.h => memoryviewer.h} | 3 +- ...{debugosxmemoryviewer.m => memoryviewer.m} | 6 ++-- ...{debugosxpointsviewer.h => pointsviewer.h} | 3 +- ...{debugosxpointsviewer.m => pointsviewer.m} | 6 ++-- ...ebugosxregistersview.h => registersview.h} | 3 +- ...ebugosxregistersview.m => registersview.m} | 2 +- ...osxwatchpointsview.h => watchpointsview.h} | 3 +- ...osxwatchpointsview.m => watchpointsview.m} | 2 +- src/osd/sdl/sdl.mak | 30 +++++++++---------- 32 files changed, 74 insertions(+), 62 deletions(-) rename src/osd/modules/debugger/osx/{debugosxbreakpointsview.h => breakpointsview.h} (95%) rename src/osd/modules/debugger/osx/{debugosxbreakpointsview.m => breakpointsview.m} (94%) rename src/osd/modules/debugger/osx/{debugosxconsoleview.h => consoleview.h} (94%) rename src/osd/modules/debugger/osx/{debugosxconsoleview.m => consoleview.m} (95%) rename src/osd/modules/debugger/osx/{debugosxdebugcommandhistory.h => debugcommandhistory.h} (100%) rename src/osd/modules/debugger/osx/{debugosxdebugcommandhistory.m => debugcommandhistory.m} (98%) rename src/osd/modules/debugger/osx/{debugosxdebugconsole.h => debugconsole.h} (97%) rename src/osd/modules/debugger/osx/{debugosxdebugconsole.m => debugconsole.m} (97%) rename src/osd/modules/debugger/osx/{debugosxdebugview.h => debugview.h} (100%) rename src/osd/modules/debugger/osx/{debugosxdebugview.m => debugview.m} (99%) rename src/osd/modules/debugger/osx/{debugosxdebugwindowhandler.h => debugwindowhandler.h} (100%) rename src/osd/modules/debugger/osx/{debugosxdebugwindowhandler.m => debugwindowhandler.m} (99%) rename src/osd/modules/debugger/osx/{debugosxdisassemblyview.h => disassemblyview.h} (97%) rename src/osd/modules/debugger/osx/{debugosxdisassemblyview.m => disassemblyview.m} (99%) rename src/osd/modules/debugger/osx/{debugosxdisassemblyviewer.h => disassemblyviewer.h} (94%) rename src/osd/modules/debugger/osx/{debugosxdisassemblyviewer.m => disassemblyviewer.m} (98%) rename src/osd/modules/debugger/osx/{debugosxerrorlogview.h => errorlogview.h} (94%) rename src/osd/modules/debugger/osx/{debugosxerrorlogview.m => errorlogview.m} (95%) rename src/osd/modules/debugger/osx/{debugosxerrorlogviewer.h => errorlogviewer.h} (94%) rename src/osd/modules/debugger/osx/{debugosxerrorlogviewer.m => errorlogviewer.m} (96%) rename src/osd/modules/debugger/osx/{debugosxmemoryview.h => memoryview.h} (97%) rename src/osd/modules/debugger/osx/{debugosxmemoryview.m => memoryview.m} (99%) rename src/osd/modules/debugger/osx/{debugosxmemoryviewer.h => memoryviewer.h} (94%) rename src/osd/modules/debugger/osx/{debugosxmemoryviewer.m => memoryviewer.m} (98%) rename src/osd/modules/debugger/osx/{debugosxpointsviewer.h => pointsviewer.h} (94%) rename src/osd/modules/debugger/osx/{debugosxpointsviewer.m => pointsviewer.m} (98%) rename src/osd/modules/debugger/osx/{debugosxregistersview.h => registersview.h} (96%) rename src/osd/modules/debugger/osx/{debugosxregistersview.m => registersview.m} (97%) rename src/osd/modules/debugger/osx/{debugosxwatchpointsview.h => watchpointsview.h} (95%) rename src/osd/modules/debugger/osx/{debugosxwatchpointsview.m => watchpointsview.m} (94%) diff --git a/src/osd/modules/debugger/debugosx.m b/src/osd/modules/debugger/debugosx.m index 440a201a2bf..7e713fc2e60 100644 --- a/src/osd/modules/debugger/debugosx.m +++ b/src/osd/modules/debugger/debugosx.m @@ -30,8 +30,8 @@ #include "osdsdl.h" #include "debug_module.h" -#import "osx/debugosxdebugconsole.h" -#import "osx/debugosxdebugwindowhandler.h" +#import "osx/debugconsole.h" +#import "osx/debugwindowhandler.h" //============================================================ diff --git a/src/osd/modules/debugger/osx/debugosxbreakpointsview.h b/src/osd/modules/debugger/osx/breakpointsview.h similarity index 95% rename from src/osd/modules/debugger/osx/debugosxbreakpointsview.h rename to src/osd/modules/debugger/osx/breakpointsview.h index 16dd78f8420..f2701200e25 100644 --- a/src/osd/modules/debugger/osx/debugosxbreakpointsview.h +++ b/src/osd/modules/debugger/osx/breakpointsview.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugview.h" + +#import "debugview.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxbreakpointsview.m b/src/osd/modules/debugger/osx/breakpointsview.m similarity index 94% rename from src/osd/modules/debugger/osx/debugosxbreakpointsview.m rename to src/osd/modules/debugger/osx/breakpointsview.m index a244e17fe7e..d84f1efbce1 100644 --- a/src/osd/modules/debugger/osx/debugosxbreakpointsview.m +++ b/src/osd/modules/debugger/osx/breakpointsview.m @@ -9,7 +9,7 @@ // //============================================================ -#import "debugosxbreakpointsview.h" +#import "breakpointsview.h" #include "debug/debugvw.h" diff --git a/src/osd/modules/debugger/osx/debugosxconsoleview.h b/src/osd/modules/debugger/osx/consoleview.h similarity index 94% rename from src/osd/modules/debugger/osx/debugosxconsoleview.h rename to src/osd/modules/debugger/osx/consoleview.h index 0c9740f02db..9ff4f15fa9f 100644 --- a/src/osd/modules/debugger/osx/debugosxconsoleview.h +++ b/src/osd/modules/debugger/osx/consoleview.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugview.h" + +#import "debugview.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxconsoleview.m b/src/osd/modules/debugger/osx/consoleview.m similarity index 95% rename from src/osd/modules/debugger/osx/debugosxconsoleview.m rename to src/osd/modules/debugger/osx/consoleview.m index 746fa26cf93..b0777cd2a84 100644 --- a/src/osd/modules/debugger/osx/debugosxconsoleview.m +++ b/src/osd/modules/debugger/osx/consoleview.m @@ -9,7 +9,7 @@ // //============================================================ -#import "debugosxconsoleview.h" +#import "consoleview.h" #include "debug/debugvw.h" diff --git a/src/osd/modules/debugger/osx/debugosxdebugcommandhistory.h b/src/osd/modules/debugger/osx/debugcommandhistory.h similarity index 100% rename from src/osd/modules/debugger/osx/debugosxdebugcommandhistory.h rename to src/osd/modules/debugger/osx/debugcommandhistory.h diff --git a/src/osd/modules/debugger/osx/debugosxdebugcommandhistory.m b/src/osd/modules/debugger/osx/debugcommandhistory.m similarity index 98% rename from src/osd/modules/debugger/osx/debugosxdebugcommandhistory.m rename to src/osd/modules/debugger/osx/debugcommandhistory.m index 0d9967370a5..b7f9e4bf91d 100644 --- a/src/osd/modules/debugger/osx/debugosxdebugcommandhistory.m +++ b/src/osd/modules/debugger/osx/debugcommandhistory.m @@ -13,7 +13,7 @@ // MAMEDebugView class //============================================================ -#import "debugosxdebugcommandhistory.h" +#import "debugcommandhistory.h" @implementation MAMEDebugCommandHistory diff --git a/src/osd/modules/debugger/osx/debugosxdebugconsole.h b/src/osd/modules/debugger/osx/debugconsole.h similarity index 97% rename from src/osd/modules/debugger/osx/debugosxdebugconsole.h rename to src/osd/modules/debugger/osx/debugconsole.h index 941a6ab2b9e..862c035cbb4 100644 --- a/src/osd/modules/debugger/osx/debugosxdebugconsole.h +++ b/src/osd/modules/debugger/osx/debugconsole.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugwindowhandler.h" + +#import "debugwindowhandler.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxdebugconsole.m b/src/osd/modules/debugger/osx/debugconsole.m similarity index 97% rename from src/osd/modules/debugger/osx/debugosxdebugconsole.m rename to src/osd/modules/debugger/osx/debugconsole.m index 2b6785b3b9e..d3aec2bb88a 100644 --- a/src/osd/modules/debugger/osx/debugosxdebugconsole.m +++ b/src/osd/modules/debugger/osx/debugconsole.m @@ -9,17 +9,17 @@ // //============================================================ -#import "debugosxdebugconsole.h" +#import "debugconsole.h" -#import "debugosxdebugcommandhistory.h" -#import "debugosxconsoleview.h" -#import "debugosxdebugview.h" -#import "debugosxdisassemblyview.h" -#import "debugosxdisassemblyviewer.h" -#import "debugosxerrorlogviewer.h" -#import "debugosxmemoryviewer.h" -#import "debugosxpointsviewer.h" -#import "debugosxregistersview.h" +#import "debugcommandhistory.h" +#import "consoleview.h" +#import "debugview.h" +#import "disassemblyview.h" +#import "disassemblyviewer.h" +#import "errorlogviewer.h" +#import "memoryviewer.h" +#import "pointsviewer.h" +#import "registersview.h" #include "debug/debugcon.h" #include "debug/debugcpu.h" diff --git a/src/osd/modules/debugger/osx/debugosxdebugview.h b/src/osd/modules/debugger/osx/debugview.h similarity index 100% rename from src/osd/modules/debugger/osx/debugosxdebugview.h rename to src/osd/modules/debugger/osx/debugview.h diff --git a/src/osd/modules/debugger/osx/debugosxdebugview.m b/src/osd/modules/debugger/osx/debugview.m similarity index 99% rename from src/osd/modules/debugger/osx/debugosxdebugview.m rename to src/osd/modules/debugger/osx/debugview.m index b9c6d49098d..c70801c3f75 100644 --- a/src/osd/modules/debugger/osx/debugosxdebugview.m +++ b/src/osd/modules/debugger/osx/debugview.m @@ -9,7 +9,7 @@ // //============================================================ -#import "debugosxdebugview.h" +#import "debugview.h" #include "debug/debugcpu.h" diff --git a/src/osd/modules/debugger/osx/debugosxdebugwindowhandler.h b/src/osd/modules/debugger/osx/debugwindowhandler.h similarity index 100% rename from src/osd/modules/debugger/osx/debugosxdebugwindowhandler.h rename to src/osd/modules/debugger/osx/debugwindowhandler.h diff --git a/src/osd/modules/debugger/osx/debugosxdebugwindowhandler.m b/src/osd/modules/debugger/osx/debugwindowhandler.m similarity index 99% rename from src/osd/modules/debugger/osx/debugosxdebugwindowhandler.m rename to src/osd/modules/debugger/osx/debugwindowhandler.m index edfbb2a27fb..3b4ed3eb590 100644 --- a/src/osd/modules/debugger/osx/debugosxdebugwindowhandler.m +++ b/src/osd/modules/debugger/osx/debugwindowhandler.m @@ -9,10 +9,10 @@ // //============================================================ -#import "debugosxdebugwindowhandler.h" +#import "debugwindowhandler.h" -#import "debugosxdebugcommandhistory.h" -#import "debugosxdebugview.h" +#import "debugcommandhistory.h" +#import "debugview.h" #include "debug/debugcpu.h" diff --git a/src/osd/modules/debugger/osx/debugosxdisassemblyview.h b/src/osd/modules/debugger/osx/disassemblyview.h similarity index 97% rename from src/osd/modules/debugger/osx/debugosxdisassemblyview.h rename to src/osd/modules/debugger/osx/disassemblyview.h index 32e61a967e6..6c261dcaa60 100644 --- a/src/osd/modules/debugger/osx/debugosxdisassemblyview.h +++ b/src/osd/modules/debugger/osx/disassemblyview.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugview.h" + +#import "debugview.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxdisassemblyview.m b/src/osd/modules/debugger/osx/disassemblyview.m similarity index 99% rename from src/osd/modules/debugger/osx/debugosxdisassemblyview.m rename to src/osd/modules/debugger/osx/disassemblyview.m index 7a482cd8504..2592aeefdfc 100644 --- a/src/osd/modules/debugger/osx/debugosxdisassemblyview.m +++ b/src/osd/modules/debugger/osx/disassemblyview.m @@ -9,7 +9,7 @@ // //============================================================ -#import "debugosxdisassemblyview.h" +#import "disassemblyview.h" #include "debug/debugcon.h" #include "debug/debugcpu.h" diff --git a/src/osd/modules/debugger/osx/debugosxdisassemblyviewer.h b/src/osd/modules/debugger/osx/disassemblyviewer.h similarity index 94% rename from src/osd/modules/debugger/osx/debugosxdisassemblyviewer.h rename to src/osd/modules/debugger/osx/disassemblyviewer.h index fa4f76bd813..fc2598249aa 100644 --- a/src/osd/modules/debugger/osx/debugosxdisassemblyviewer.h +++ b/src/osd/modules/debugger/osx/disassemblyviewer.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugwindowhandler.h" + +#import "debugwindowhandler.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxdisassemblyviewer.m b/src/osd/modules/debugger/osx/disassemblyviewer.m similarity index 98% rename from src/osd/modules/debugger/osx/debugosxdisassemblyviewer.m rename to src/osd/modules/debugger/osx/disassemblyviewer.m index 3a965fe1404..6b4272202bb 100644 --- a/src/osd/modules/debugger/osx/debugosxdisassemblyviewer.m +++ b/src/osd/modules/debugger/osx/disassemblyviewer.m @@ -9,10 +9,10 @@ // //============================================================ -#import "debugosxdisassemblyviewer.h" +#import "disassemblyviewer.h" -#import "debugosxdebugview.h" -#import "debugosxdisassemblyview.h" +#import "debugview.h" +#import "disassemblyview.h" #include "debug/debugcpu.h" diff --git a/src/osd/modules/debugger/osx/debugosxerrorlogview.h b/src/osd/modules/debugger/osx/errorlogview.h similarity index 94% rename from src/osd/modules/debugger/osx/debugosxerrorlogview.h rename to src/osd/modules/debugger/osx/errorlogview.h index 7f85a06147f..168511c1819 100644 --- a/src/osd/modules/debugger/osx/debugosxerrorlogview.h +++ b/src/osd/modules/debugger/osx/errorlogview.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugview.h" + +#import "debugview.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxerrorlogview.m b/src/osd/modules/debugger/osx/errorlogview.m similarity index 95% rename from src/osd/modules/debugger/osx/debugosxerrorlogview.m rename to src/osd/modules/debugger/osx/errorlogview.m index 49ffac807b0..6ba563b071a 100644 --- a/src/osd/modules/debugger/osx/debugosxerrorlogview.m +++ b/src/osd/modules/debugger/osx/errorlogview.m @@ -9,7 +9,7 @@ // //============================================================ -#import "debugosxerrorlogview.h" +#import "errorlogview.h" #include "debug/debugvw.h" diff --git a/src/osd/modules/debugger/osx/debugosxerrorlogviewer.h b/src/osd/modules/debugger/osx/errorlogviewer.h similarity index 94% rename from src/osd/modules/debugger/osx/debugosxerrorlogviewer.h rename to src/osd/modules/debugger/osx/errorlogviewer.h index caab178d854..c2728298c14 100644 --- a/src/osd/modules/debugger/osx/debugosxerrorlogviewer.h +++ b/src/osd/modules/debugger/osx/errorlogviewer.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugwindowhandler.h" + +#import "debugwindowhandler.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxerrorlogviewer.m b/src/osd/modules/debugger/osx/errorlogviewer.m similarity index 96% rename from src/osd/modules/debugger/osx/debugosxerrorlogviewer.m rename to src/osd/modules/debugger/osx/errorlogviewer.m index b0abaeaeca6..44189922f91 100644 --- a/src/osd/modules/debugger/osx/debugosxerrorlogviewer.m +++ b/src/osd/modules/debugger/osx/errorlogviewer.m @@ -9,9 +9,9 @@ // //============================================================ -#import "debugosxerrorlogviewer.h" +#import "errorlogviewer.h" -#import "debugosxerrorlogview.h" +#import "errorlogview.h" @implementation MAMEErrorLogViewer diff --git a/src/osd/modules/debugger/osx/debugosxmemoryview.h b/src/osd/modules/debugger/osx/memoryview.h similarity index 97% rename from src/osd/modules/debugger/osx/debugosxmemoryview.h rename to src/osd/modules/debugger/osx/memoryview.h index 45f39787c5a..a0cb51ba7c1 100644 --- a/src/osd/modules/debugger/osx/debugosxmemoryview.h +++ b/src/osd/modules/debugger/osx/memoryview.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugview.h" + +#import "debugview.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxmemoryview.m b/src/osd/modules/debugger/osx/memoryview.m similarity index 99% rename from src/osd/modules/debugger/osx/debugosxmemoryview.m rename to src/osd/modules/debugger/osx/memoryview.m index 3bebe290c79..b35701df757 100644 --- a/src/osd/modules/debugger/osx/debugosxmemoryview.m +++ b/src/osd/modules/debugger/osx/memoryview.m @@ -9,7 +9,7 @@ // //============================================================ -#import "debugosxmemoryview.h" +#import "memoryview.h" #include "debug/debugcpu.h" #include "debug/debugvw.h" diff --git a/src/osd/modules/debugger/osx/debugosxmemoryviewer.h b/src/osd/modules/debugger/osx/memoryviewer.h similarity index 94% rename from src/osd/modules/debugger/osx/debugosxmemoryviewer.h rename to src/osd/modules/debugger/osx/memoryviewer.h index 4ea37140fdc..45db9c21051 100644 --- a/src/osd/modules/debugger/osx/debugosxmemoryviewer.h +++ b/src/osd/modules/debugger/osx/memoryviewer.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugwindowhandler.h" + +#import "debugwindowhandler.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxmemoryviewer.m b/src/osd/modules/debugger/osx/memoryviewer.m similarity index 98% rename from src/osd/modules/debugger/osx/debugosxmemoryviewer.m rename to src/osd/modules/debugger/osx/memoryviewer.m index d3413e58a99..044f0f442df 100644 --- a/src/osd/modules/debugger/osx/debugosxmemoryviewer.m +++ b/src/osd/modules/debugger/osx/memoryviewer.m @@ -9,10 +9,10 @@ // //============================================================ -#import "debugosxmemoryviewer.h" +#import "memoryviewer.h" -#import "debugosxdebugview.h" -#import "debugosxmemoryview.h" +#import "debugview.h" +#import "memoryview.h" #include "debug/debugcpu.h" diff --git a/src/osd/modules/debugger/osx/debugosxpointsviewer.h b/src/osd/modules/debugger/osx/pointsviewer.h similarity index 94% rename from src/osd/modules/debugger/osx/debugosxpointsviewer.h rename to src/osd/modules/debugger/osx/pointsviewer.h index 885affcc0a6..5df282ef850 100644 --- a/src/osd/modules/debugger/osx/debugosxpointsviewer.h +++ b/src/osd/modules/debugger/osx/pointsviewer.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugwindowhandler.h" + +#import "debugwindowhandler.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxpointsviewer.m b/src/osd/modules/debugger/osx/pointsviewer.m similarity index 98% rename from src/osd/modules/debugger/osx/debugosxpointsviewer.m rename to src/osd/modules/debugger/osx/pointsviewer.m index b5667581af1..27c8f36417e 100644 --- a/src/osd/modules/debugger/osx/debugosxpointsviewer.m +++ b/src/osd/modules/debugger/osx/pointsviewer.m @@ -9,10 +9,10 @@ // //============================================================ -#import "debugosxpointsviewer.h" +#import "pointsviewer.h" -#import "debugosxbreakpointsview.h" -#import "debugosxwatchpointsview.h" +#import "breakpointsview.h" +#import "watchpointsview.h" @implementation MAMEPointsViewer diff --git a/src/osd/modules/debugger/osx/debugosxregistersview.h b/src/osd/modules/debugger/osx/registersview.h similarity index 96% rename from src/osd/modules/debugger/osx/debugosxregistersview.h rename to src/osd/modules/debugger/osx/registersview.h index 5951cef4dc2..5b1ab6a54e5 100644 --- a/src/osd/modules/debugger/osx/debugosxregistersview.h +++ b/src/osd/modules/debugger/osx/registersview.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugview.h" + +#import "debugview.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxregistersview.m b/src/osd/modules/debugger/osx/registersview.m similarity index 97% rename from src/osd/modules/debugger/osx/debugosxregistersview.m rename to src/osd/modules/debugger/osx/registersview.m index 49c635250eb..ba2cf93cd09 100644 --- a/src/osd/modules/debugger/osx/debugosxregistersview.m +++ b/src/osd/modules/debugger/osx/registersview.m @@ -9,7 +9,7 @@ // //============================================================ -#import "debugosxregistersview.h" +#import "registersview.h" #include "debug/debugcpu.h" #include "debug/debugvw.h" diff --git a/src/osd/modules/debugger/osx/debugosxwatchpointsview.h b/src/osd/modules/debugger/osx/watchpointsview.h similarity index 95% rename from src/osd/modules/debugger/osx/debugosxwatchpointsview.h rename to src/osd/modules/debugger/osx/watchpointsview.h index 02a2c885dfc..23379de570c 100644 --- a/src/osd/modules/debugger/osx/debugosxwatchpointsview.h +++ b/src/osd/modules/debugger/osx/watchpointsview.h @@ -10,7 +10,8 @@ //============================================================ #import "debugosx.h" -#import "debugosxdebugview.h" + +#import "debugview.h" #include "emu.h" diff --git a/src/osd/modules/debugger/osx/debugosxwatchpointsview.m b/src/osd/modules/debugger/osx/watchpointsview.m similarity index 94% rename from src/osd/modules/debugger/osx/debugosxwatchpointsview.m rename to src/osd/modules/debugger/osx/watchpointsview.m index a023351eb77..34dc5858a48 100644 --- a/src/osd/modules/debugger/osx/debugosxwatchpointsview.m +++ b/src/osd/modules/debugger/osx/watchpointsview.m @@ -9,7 +9,7 @@ // //============================================================ -#import "debugosxwatchpointsview.h" +#import "watchpointsview.h" #include "debug/debugvw.h" diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index 41e945b728d..423e4422954 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -289,21 +289,21 @@ OBJDIRS += $(OSDOBJ)/modules/debugger/osx DEBUGOBJS = \ $(OSDOBJ)/modules/debugger/debugosx.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxbreakpointsview.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxconsoleview.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxdebugcommandhistory.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxdebugconsole.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxdebugview.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxdebugwindowhandler.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxdisassemblyview.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxdisassemblyviewer.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxerrorlogview.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxerrorlogviewer.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxmemoryview.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxmemoryviewer.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxpointsviewer.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxregistersview.o \ - $(OSDOBJ)/modules/debugger/osx/debugosxwatchpointsview.o + $(OSDOBJ)/modules/debugger/osx/breakpointsview.o \ + $(OSDOBJ)/modules/debugger/osx/consoleview.o \ + $(OSDOBJ)/modules/debugger/osx/debugcommandhistory.o \ + $(OSDOBJ)/modules/debugger/osx/debugconsole.o \ + $(OSDOBJ)/modules/debugger/osx/debugview.o \ + $(OSDOBJ)/modules/debugger/osx/debugwindowhandler.o \ + $(OSDOBJ)/modules/debugger/osx/disassemblyview.o \ + $(OSDOBJ)/modules/debugger/osx/disassemblyviewer.o \ + $(OSDOBJ)/modules/debugger/osx/errorlogview.o \ + $(OSDOBJ)/modules/debugger/osx/errorlogviewer.o \ + $(OSDOBJ)/modules/debugger/osx/memoryview.o \ + $(OSDOBJ)/modules/debugger/osx/memoryviewer.o \ + $(OSDOBJ)/modules/debugger/osx/pointsviewer.o \ + $(OSDOBJ)/modules/debugger/osx/registersview.o \ + $(OSDOBJ)/modules/debugger/osx/watchpointsview.o endif