Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-03 09:06:08 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #464 from 0-wiz-0/master

Browse Source 
Fix build on NetBSD.
This commit is contained in:
R. Belmont 2015-11-13 12:20:29 -05:00
commit 4884956b4e
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/bx/include/bx/os.h vendored
View File

@ -15,6 +15,7 @@
#elif BX_PLATFORM_ANDROID \ #elif BX_PLATFORM_ANDROID \
|| BX_PLATFORM_EMSCRIPTEN \ || BX_PLATFORM_EMSCRIPTEN \
|| BX_PLATFORM_FREEBSD \ || BX_PLATFORM_FREEBSD \
|| BX_PLATFORM_NETBSD \
|| BX_PLATFORM_IOS \ || BX_PLATFORM_IOS \
|| BX_PLATFORM_LINUX \ || BX_PLATFORM_LINUX \
|| BX_PLATFORM_NACL \ || BX_PLATFORM_NACL \
@ -24,6 +25,7 @@
# include <sched.h> // sched_yield # include <sched.h> // sched_yield
# if BX_PLATFORM_FREEBSD \ # if BX_PLATFORM_FREEBSD \
|| BX_PLATFORM_NETBSD \
|| BX_PLATFORM_IOS \ || BX_PLATFORM_IOS \
|| BX_PLATFORM_NACL \ || BX_PLATFORM_NACL \
|| BX_PLATFORM_OSX \ || BX_PLATFORM_OSX \
@ -103,7 +105,7 @@ namespace bx
return (pid_t)::syscall(SYS_gettid); return (pid_t)::syscall(SYS_gettid);
#elif BX_PLATFORM_IOS || BX_PLATFORM_OSX #elif BX_PLATFORM_IOS || BX_PLATFORM_OSX
return (mach_port_t)::pthread_mach_thread_np(pthread_self() ); return (mach_port_t)::pthread_mach_thread_np(pthread_self() );
#elif BX_PLATFORM_FREEBSD || BX_PLATFORM_NACL #elif BX_PLATFORM_FREEBSD || BX_PLATFORM_NACL || BX_PLATFORM_NETBSD
// Casting __nc_basic_thread_data*... need better way to do this. // Casting __nc_basic_thread_data*... need better way to do this.
return *(uint32_t*)::pthread_self(); return *(uint32_t*)::pthread_self();
#else #else

7
3rdparty/bx/include/bx/platform.h vendored
View File

@ -15,6 +15,7 @@
#define BX_PLATFORM_ANDROID 0 #define BX_PLATFORM_ANDROID 0
#define BX_PLATFORM_EMSCRIPTEN 0 #define BX_PLATFORM_EMSCRIPTEN 0
#define BX_PLATFORM_FREEBSD 0 #define BX_PLATFORM_FREEBSD 0
#define BX_PLATFORM_NETBSD 0
#define BX_PLATFORM_IOS 0 #define BX_PLATFORM_IOS 0
#define BX_PLATFORM_LINUX 0 #define BX_PLATFORM_LINUX 0
#define BX_PLATFORM_NACL 0 #define BX_PLATFORM_NACL 0
@ -187,6 +188,9 @@
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
# undef BX_PLATFORM_FREEBSD # undef BX_PLATFORM_FREEBSD
# define BX_PLATFORM_FREEBSD 1 # define BX_PLATFORM_FREEBSD 1
#elif defined(__NetBSD__)
# undef BX_PLATFORM_NETBSD
# define BX_PLATFORM_NETBSD 1
#else #else
# error "BX_PLATFORM_* is not defined!" # error "BX_PLATFORM_* is not defined!"
#endif // #endif //
@ -195,6 +199,7 @@
|| BX_PLATFORM_ANDROID \ || BX_PLATFORM_ANDROID \
|| BX_PLATFORM_EMSCRIPTEN \ || BX_PLATFORM_EMSCRIPTEN \
|| BX_PLATFORM_FREEBSD \ || BX_PLATFORM_FREEBSD \
|| BX_PLATFORM_NETBSD \
|| BX_PLATFORM_IOS \ || BX_PLATFORM_IOS \
|| BX_PLATFORM_LINUX \ || BX_PLATFORM_LINUX \
|| BX_PLATFORM_NACL \ || BX_PLATFORM_NACL \
@ -244,6 +249,8 @@
BX_STRINGIZE(__EMSCRIPTEN_tiny__) BX_STRINGIZE(__EMSCRIPTEN_tiny__)
#elif BX_PLATFORM_FREEBSD #elif BX_PLATFORM_FREEBSD
# define BX_PLATFORM_NAME "FreeBSD" # define BX_PLATFORM_NAME "FreeBSD"
#elif BX_PLATFORM_NETBSD
# define BX_PLATFORM_NAME "NetBSD"
#elif BX_PLATFORM_IOS #elif BX_PLATFORM_IOS
# define BX_PLATFORM_NAME "iOS" # define BX_PLATFORM_NAME "iOS"
#elif BX_PLATFORM_LINUX #elif BX_PLATFORM_LINUX

6
3rdparty/genie/build/gmake.bsd/genie.make vendored
View File

@ -56,7 +56,6 @@ ifeq ($(config),release)
$(OBJDIR)/src/host/os_chdir.o \ $(OBJDIR)/src/host/os_chdir.o \
$(OBJDIR)/src/host/os_copyfile.o \ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/os_getcwd.o \ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_getversion.o \
$(OBJDIR)/src/host/os_is64bit.o \ $(OBJDIR)/src/host/os_is64bit.o \
$(OBJDIR)/src/host/os_isdir.o \ $(OBJDIR)/src/host/os_isdir.o \
$(OBJDIR)/src/host/os_isfile.o \ $(OBJDIR)/src/host/os_isfile.o \
@ -134,7 +133,6 @@ ifeq ($(config),debug)
$(OBJDIR)/src/host/os_chdir.o \ $(OBJDIR)/src/host/os_chdir.o \
$(OBJDIR)/src/host/os_copyfile.o \ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/os_getcwd.o \ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_getversion.o \
$(OBJDIR)/src/host/os_is64bit.o \ $(OBJDIR)/src/host/os_is64bit.o \
$(OBJDIR)/src/host/os_isdir.o \ $(OBJDIR)/src/host/os_isdir.o \
$(OBJDIR)/src/host/os_isfile.o \ $(OBJDIR)/src/host/os_isfile.o \
@ -252,10 +250,6 @@ $(OBJDIR)/src/host/os_getcwd.o: ../../src/host/os_getcwd.c
@echo $(notdir $<) @echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<" $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
$(OBJDIR)/src/host/os_getversion.o: ../../src/host/os_getversion.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
$(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c $(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c
@echo $(notdir $<) @echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<" $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"

6
3rdparty/genie/build/gmake.solaris/genie.make vendored
View File

@ -56,7 +56,6 @@ ifeq ($(config),release)
$(OBJDIR)/src/host/os_chdir.o \ $(OBJDIR)/src/host/os_chdir.o \
$(OBJDIR)/src/host/os_copyfile.o \ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/os_getcwd.o \ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_getversion.o \
$(OBJDIR)/src/host/os_is64bit.o \ $(OBJDIR)/src/host/os_is64bit.o \
$(OBJDIR)/src/host/os_isdir.o \ $(OBJDIR)/src/host/os_isdir.o \
$(OBJDIR)/src/host/os_isfile.o \ $(OBJDIR)/src/host/os_isfile.o \
@ -134,7 +133,6 @@ ifeq ($(config),debug)
$(OBJDIR)/src/host/os_chdir.o \ $(OBJDIR)/src/host/os_chdir.o \
$(OBJDIR)/src/host/os_copyfile.o \ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/os_getcwd.o \ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_getversion.o \
$(OBJDIR)/src/host/os_is64bit.o \ $(OBJDIR)/src/host/os_is64bit.o \
$(OBJDIR)/src/host/os_isdir.o \ $(OBJDIR)/src/host/os_isdir.o \
$(OBJDIR)/src/host/os_isfile.o \ $(OBJDIR)/src/host/os_isfile.o \
@ -252,10 +250,6 @@ $(OBJDIR)/src/host/os_getcwd.o: ../../src/host/os_getcwd.c
@echo $(notdir $<) @echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<" $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
$(OBJDIR)/src/host/os_getversion.o: ../../src/host/os_getversion.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
$(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c $(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c
@echo $(notdir $<) @echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<" $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"

1
src/osd/sdl/sdlptty_unix.cpp
View File

@ -19,6 +19,7 @@
# include <termios.h> # include <termios.h>
# include <libutil.h> # include <libutil.h>
#elif defined(SDLMAME_NETBSD) || defined(SDLMAME_MACOSX) #elif defined(SDLMAME_NETBSD) || defined(SDLMAME_MACOSX)
# include <termios.h>
# include <util.h> # include <util.h>
#elif defined(SDLMAME_OPENBSD) #elif defined(SDLMAME_OPENBSD)
# include <termios.h> # include <termios.h>