summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-01-28 08:03:44 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-01-28 08:03:44 +0000
commitfe3d7c4af458de82a0153ebf38cf61c6fb1f5db0 (patch)
tree4e078d20d6ee1151581e29b9a14c3dcc48c40ba2 /src/osd
parenta8bd722f187dca0ad9c77acf0bb8237a4aeef9e1 (diff)
Cleanups and version bump.
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/sdl/debugwin.c16
-rw-r--r--src/osd/sdl/sdl.mak62
-rw-r--r--src/osd/windows/windows.mak2
-rw-r--r--src/osd/windows/winmain.c22
4 files changed, 51 insertions, 51 deletions
diff --git a/src/osd/sdl/debugwin.c b/src/osd/sdl/debugwin.c
index 5ded54a9cdb..1cbc9a9c81b 100644
--- a/src/osd/sdl/debugwin.c
+++ b/src/osd/sdl/debugwin.c
@@ -32,11 +32,11 @@
#define MAX_VIEWS (4)
enum {
- WIN_TYPE_MAIN = 0x01,
+ WIN_TYPE_MAIN = 0x01,
WIN_TYPE_MEMORY = 0x02,
WIN_TYPE_DISASM = 0x04,
- WIN_TYPE_LOG = 0x08,
- WIN_TYPE_ALL = 0x0f
+ WIN_TYPE_LOG = 0x08,
+ WIN_TYPE_ALL = 0x0f
};
//============================================================
@@ -65,7 +65,7 @@ struct _win_i {
int type;
win_i * next;
GtkWidget * win;
- edit ed;
+ edit ed;
running_machine * machine; // machine
DView * views[MAX_VIEWS];
running_device * cpu; // current CPU
@@ -1119,7 +1119,7 @@ on_memoryview_key_press_event (GtkWidget *widget,
DView *info = (DView *) widget;
//printf("%s\n", event->string);
//printf("The name of this keysym is `%s'\n",
- // gdk_keyval_name(event->keyval));
+ // gdk_keyval_name(event->keyval));
//if (/*waiting_for_debugger ||*/ !debugwin_seq_pressed(info->view-> owner->machine))
switch (event->keyval)
{
@@ -1169,15 +1169,15 @@ on_memoryview_key_press_event (GtkWidget *widget,
case GDK_Escape:
//if (info->owner->focuswnd != NULL)
- // SetFocus(info->owner->focuswnd);
+ // SetFocus(info->owner->focuswnd);
//info->owner->ignore_char_lparam = lparam >> 16;
break;
case GDK_Tab:
//if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
- // debugwin_view_prev_view(info->owner, info);
+ // debugwin_view_prev_view(info->owner, info);
//else
- // debugwin_view_next_view(info->view, dvw);
+ // debugwin_view_next_view(info->view, dvw);
break;
default:
if (event->keyval >= 32 && event->keyval < 127 && debug_view_get_cursor_supported(info->view))
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index 0721f72ea31..54100ca0e46 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -7,7 +7,7 @@
# Copyright (c) 1996-2010, Nicola Salmoria and the MAME Team.
# Visit http://mamedev.org for licensing and usage restrictions.
#
-# SDLMAME by Olivier Galibert and R. Belmont
+# SDLMAME by Olivier Galibert and R. Belmont
#
###########################################################################
@@ -42,8 +42,8 @@
# this will also add a rpath to the executable
# MESA_INSTALL_ROOT = /usr/local/dfb_GL
-# uncomment the next line to build a binary using
-# GL-dispatching.
+# uncomment the next line to build a binary using
+# GL-dispatching.
# This option takes precedence over MESA_INSTALL_ROOT
USE_DISPATCH_GL = 1
@@ -80,18 +80,18 @@ CCOMFLAGS += $(OPT_FLAGS)
#-------------------------------------------------
# distribution may change things
#-------------------------------------------------
-
+
ifeq ($(DISTRO),)
DISTRO = generic
-else
+else
ifeq ($(DISTRO),debian-stable)
DEFS += -DNO_AFFINITY_NP
-else
+else
ifeq ($(DISTRO),ubuntu-intrepid)
# Force gcc-4.2 on ubuntu-intrepid
CC = @gcc -V 4.2
LD = g++-4.2
-else
+else
ifeq ($(DISTRO),gcc44-generic)
CC = @gcc -V 4.4
LD = @g++ -V 4.4
@@ -139,11 +139,11 @@ endif
ifeq ($(TARGETOS),freebsd)
BASE_TARGETOS = unix
SYNC_IMPLEMENTATION = tc
-DEFS += -DNO_AFFINITY_NP
+DEFS += -DNO_AFFINITY_NP
# /usr/local/include is not considered a system include directory
# on FreeBSD. GL.h resides there and throws warnings
CCOMFLAGS += -isystem /usr/local/include
-# No clue here. There is a popmessage(NULL) in uimenu.c which
+# No clue here. There is a popmessage(NULL) in uimenu.c which
# triggers a non-null format warning on FreeBSD only.
CCOMFLAGS += -Wno-format
endif
@@ -195,7 +195,7 @@ ifeq ($(TARGETOS),win32)
BASE_TARGETOS = win32
SYNC_IMPLEMENTATION = win32
NO_X11 = 1
-DEFS += -DSDLMAME_WIN32 -DX64_WINDOWS_ABI
+DEFS += -DSDLMAME_WIN32 -DX64_WINDOWS_ABI
LIBGL = -lopengl32
SDLMAIN = $(SDLOBJ)/main.o
# needed for unidasm
@@ -207,7 +207,7 @@ NO_DEBUGGER = 1
else
DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
LIBS += -lgtk-win32-2.0 -lgdk-win32-2.0 -lgmodule-2.0 -lglib-2.0 -lgobject-2.0 \
- -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0
+ -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0
CCOMFLAGS += -mms-bitfields \
-I$(GTK_INSTALL_ROOT)/include/gtk-2.0 -I$(GTK_INSTALL_ROOT)/include/glib-2.0 \
-I$(GTK_INSTALL_ROOT)/include/cairo -I$(GTK_INSTALL_ROOT)/include/pango-1.0 \
@@ -256,11 +256,11 @@ OBJDIRS += $(SDLOBJ)
OSDCOREOBJS = \
$(SDLOBJ)/strconv.o \
$(SDLOBJ)/sdldir.o \
- $(SDLOBJ)/sdlfile.o \
+ $(SDLOBJ)/sdlfile.o \
$(SDLOBJ)/sdlmisc_$(BASE_TARGETOS).o \
$(SDLOBJ)/sdlos_$(BASE_TARGETOS).o \
$(SDLOBJ)/sdlsync_$(SYNC_IMPLEMENTATION).o \
- $(SDLOBJ)/sdlwork.o
+ $(SDLOBJ)/sdlwork.o
# any "main" must be in LIBOSD or else the build will fail!
# for the windows build, we just add it to libocore as well.
@@ -272,7 +272,7 @@ OSDOBJS = \
$(SDLOBJ)/video.o \
$(SDLOBJ)/drawsdl.o \
$(SDLOBJ)/window.o \
- $(SDLOBJ)/output.o
+ $(SDLOBJ)/output.o
# Add SDL1.3 support
ifdef SDL_INSTALL_ROOT
@@ -338,16 +338,16 @@ endif
ifndef SDL_INSTALL_ROOT
CCOMFLAGS += `sdl-config --cflags`
-LIBS += -lm `sdl-config --libs`
+LIBS += -lm `sdl-config --libs`
else
CCOMFLAGS += -I$(SDL_INSTALL_ROOT)/include -D_GNU_SOURCE=1
-LIBS += -lm -L$(SDL_INSTALL_ROOT)/lib -Wl,-rpath,$(SDL_INSTALL_ROOT)/lib -lSDL
+LIBS += -lm -L$(SDL_INSTALL_ROOT)/lib -Wl,-rpath,$(SDL_INSTALL_ROOT)/lib -lSDL
endif
endif # Unix
#-------------------------------------------------
-# Windows
+# Windows
#-------------------------------------------------
# Win32: add the necessary libraries
@@ -358,7 +358,7 @@ OSDCOREOBJS += $(SDLMAIN)
ifdef SDL_INSTALL_ROOT
CCOMFLAGS += -I$(SDL_INSTALL_ROOT)/include
-LIBS += -L$(SDL_INSTALL_ROOT)/lib
+LIBS += -L$(SDL_INSTALL_ROOT)/lib
#-Wl,-rpath,$(SDL_INSTALL_ROOT)/lib
endif
@@ -366,13 +366,13 @@ endif
# Static linking
LDFLAGS += -static-libgcc
-LIBS += -Wl,-Bstatic -lSDL -Wl,-Bdynamic
+LIBS += -Wl,-Bstatic -lSDL -Wl,-Bdynamic
LIBS += -luser32 -lgdi32 -lddraw -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi
endif # Win32
#-------------------------------------------------
-# Mac OS X
+# Mac OS X
#-------------------------------------------------
ifeq ($(BASE_TARGETOS),macosx)
@@ -380,7 +380,7 @@ ifeq ($(BASE_TARGETOS),macosx)
ifndef MACOSX_USE_LIBSDL
# Compile using framework (compile using libSDL is the exception)
-LIBS += -framework SDL -framework Cocoa -framework OpenGL -lpthread
+LIBS += -framework SDL -framework Cocoa -framework OpenGL -lpthread
else
# Compile using installed libSDL (Fink or MacPorts):
#
@@ -395,7 +395,7 @@ endif
endif # Mac OS X
#-------------------------------------------------
-# OS/2
+# OS/2
#-------------------------------------------------
ifeq ($(BASE_TARGETOS),os2)
@@ -406,7 +406,7 @@ LIBS += `sdl-config --libs`
endif # OS2
#-------------------------------------------------
-# Debugging
+# Debugging
#-------------------------------------------------
ifeq ($(NO_DEBUGGER),1)
@@ -418,7 +418,7 @@ OSDOBJS += $(DEBUGOBJS)
endif # NO_DEBUGGER
#-------------------------------------------------
-# OPENGL
+# OPENGL
#-------------------------------------------------
ifeq ($(NO_OPENGL),1)
@@ -442,7 +442,7 @@ endif
endif
#-------------------------------------------------
-# X11
+# X11
#-------------------------------------------------
ifeq ($(NO_X11),1)
@@ -454,7 +454,7 @@ LIBS += -lX11 -lXinerama
# the new debugger relies on GTK+ in addition to the base SDLMAME needs
# Non-X11 builds can not use the debugger
-CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
+CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
#CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
@@ -465,7 +465,7 @@ CCOMFLAGS += -I/usr/X11/include -I/usr/X11R6/include -I/usr/openwin/include
endif # NO_X11
#-------------------------------------------------
-# Dependencies
+# Dependencies
#-------------------------------------------------
# due to quirks of using /bin/sh, we need to explicitly specify the current path
@@ -491,16 +491,16 @@ $(LIBOCORE): $(OSDCOREOBJS)
$(LIBOSD): $(OSDOBJS)
#-------------------------------------------------
-# Tools
+# Tools
#-------------------------------------------------
TOOLS += \
testkeys$(EXE)
-$(SDLOBJ)/testkeys.o: $(SDLSRC)/testkeys.c
+$(SDLOBJ)/testkeys.o: $(SDLSRC)/testkeys.c
@echo Compiling $<...
$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
-
+
TESTKEYSOBJS = \
$(SDLOBJ)/testkeys.o \
@@ -529,7 +529,7 @@ BUILD_VERSION = $(shell grep 'build_version\[\] =' src/version.c | sed -e "s/.*=
DISTFILES = test_dist.sh whatsnew.txt whatsnew_$(BUILD_VERSION).txt makefile docs/ src/
EXCLUDES = -x "*/.svn/*"
-zip:
+zip:
zip -rq ../mame_$(BUILD_VERSION).zip $(DISTFILES) $(EXCLUDES)
DEPENDFILE = .depend_$(EMULATOR)
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index 8c24fd291d6..779a21ffdb9 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -208,7 +208,7 @@ DEFS += -Dmain=utf8_main
# debug build: enable guard pages on all memory allocations
ifdef DEBUG
-DEFS += -DMALLOC_DEBUG
+#DEFS += -DMALLOC_DEBUG
endif
diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c
index 15fb9f6cb62..8e3176dc034 100644
--- a/src/osd/windows/winmain.c
+++ b/src/osd/windows/winmain.c
@@ -451,7 +451,7 @@ static void soft_link_functions(void)
av_set_mm_max_thread_characteristics = (av_set_mm_max_thread_characteristics_ptr)GetProcAddress(library, "AvSetMmMaxThreadCharacteristics" UNICODE_POSTFIX);
av_revert_mm_thread_characteristics = (av_revert_mm_thread_characteristics_ptr)GetProcAddress(library, "AvRevertMmThreadCharacteristics");
}
-
+
// psapi helpers (not available in win9x)
library = LoadLibrary(TEXT("psapi.dll"));
if (library != NULL)
@@ -646,10 +646,10 @@ static LONG CALLBACK exception_filter(struct _EXCEPTION_POINTERS *info)
{
CONTEXT context = *info->ContextRecord;
STACKFRAME64 stackframe;
-
+
// initialize the symbol lookup
sym_initialize(GetCurrentProcess(), NULL, TRUE);
-
+
// reprint the actual exception address
fprintf(stderr, "-----------------------------------------------------\n");
fprintf(stderr, "Stack crawl:\n");
@@ -700,15 +700,15 @@ static const char *line_to_symbol(const char *line, FPTR &address)
{
#ifdef __GNUC__
/*
- 32-bit gcc map line:
+ 32-bit gcc map line:
0x0089cb00 nbmj9195_palette_r(_address_space const*, unsigned int)
- 64-bit gcc map line:
+ 64-bit gcc map line:
0x0000000000961afc nbmj9195_palette_r(_address_space const*, unsigned int)
*/
char symbol[1024];
void *temp;
-
+
// find a matching start
if (strncmp(line, " 0x", 18) == 0)
if (sscanf(line, " 0x%p %s", &temp, symbol) == 2)
@@ -720,16 +720,16 @@ static const char *line_to_symbol(const char *line, FPTR &address)
#ifdef _MSC_VER
/*
- 32-bit MSVC map line:
+ 32-bit MSVC map line:
0001:00387890 ?nbmj9195_palette_r@@YAEPBU_address_space@@I@Z 00788890 f nichibut:nbmj9195.o
- 64-bit MSVC map line:
+ 64-bit MSVC map line:
0001:004d7510 ?nbmj9195_palette_r@@YAEPEBU_address_space@@I@Z 00000001404d8510 f nichibut:nbmj9195.o
*/
static char symbol[1024];
int dummy1, dummy2;
void *temp;
-
+
symbol[0] = 0;
if (line[0] == ' ' && line[5] == ':')
if (sscanf(line, " %04x:%08x %s %p", &dummy1, &dummy2, symbol, &temp) == 4)
@@ -765,7 +765,7 @@ static const char *lookup_symbol(FPTR address)
{
IMAGEHLP_LINE64 lineinfo = { sizeof(lineinfo) };
DWORD linedisp;
-
+
// try to get source info as well; again we are returned an ANSI string
if (sym_get_line_from_addr_64 != NULL && sym_get_line_from_addr_64(GetCurrentProcess(), address, &linedisp, &lineinfo))
sprintf(buffer, " (%s+0x%04x, %s:%d)", info.Name, (UINT32)displacement, lineinfo.FileName, (int)lineinfo.LineNumber);
@@ -1020,7 +1020,7 @@ static void start_profiler(void)
{
HANDLE currentThread;
BOOL result;
-
+
assert_always(
// parse the map file, if present