mirror of
https://github.com/gryf/gryf-overlay.git
synced 2026-04-01 19:03:32 +02:00
Removed bunch of outdated ebuilds
This commit is contained in:
@@ -1,270 +0,0 @@
|
||||
#
|
||||
# CORE CONFIGURATION OPTIONS
|
||||
#
|
||||
readconfig 1
|
||||
writeconfig 0
|
||||
|
||||
#
|
||||
# CORE SEARCH PATH OPTIONS
|
||||
#
|
||||
rompath $HOME/.sdlmame/roms;@GAMES_DATADIR@/sdlmame/roms
|
||||
samplepath $HOME/.sdlmame/samples;@GAMES_DATADIR@/sdlmame/samples
|
||||
artpath $HOME/.sdlmame/artwork;@GAMES_DATADIR@/sdlmame/artwork
|
||||
ctrlrpath $HOME/.sdlmame/ctrlr;@GAMES_SYSCONFDIR@/sdlmame/ctrlr;@GAMES_DATADIR@/sdlmame/ctrlr
|
||||
inipath $HOME/.sdlmame;@GAMES_SYSCONFDIR@/sdlmame
|
||||
fontpath $HOME/.sdlmame;@GAMES_DATADIR@/sdlmame
|
||||
cheatpath $HOME/.sdlmame/cheats;@GAMES_SYSCONFDIR@/sdlmame/cheats;@GAMES_DATADIR@/sdlmame/cheats
|
||||
crosshairpath $HOME/.sdlmame/crosshair;@GAMES_DATADIR@/sdlmame/crosshair
|
||||
|
||||
#
|
||||
# CORE OUTPUT DIRECTORY OPTIONS
|
||||
#
|
||||
cfg_directory $HOME/.sdlmame/cfg
|
||||
nvram_directory $HOME/.sdlmame/nvram
|
||||
memcard_directory $HOME/.sdlmame/memcard
|
||||
input_directory $HOME/.sdlmame/inp
|
||||
state_directory $HOME/.sdlmame/sta
|
||||
snapshot_directory $HOME/.sdlmame/snap
|
||||
diff_directory $HOME/.sdlmame/diff
|
||||
comment_directory $HOME/.sdlmame/comments
|
||||
|
||||
#
|
||||
# CORE STATE/PLAYBACK OPTIONS
|
||||
#
|
||||
state
|
||||
autosave 0
|
||||
playback
|
||||
record
|
||||
mngwrite
|
||||
aviwrite
|
||||
wavwrite
|
||||
snapname %g/%i
|
||||
snapsize auto
|
||||
snapview internal
|
||||
burnin 0
|
||||
|
||||
#
|
||||
# CORE PERFORMANCE OPTIONS
|
||||
#
|
||||
autoframeskip 0
|
||||
frameskip 0
|
||||
seconds_to_run 0
|
||||
throttle 1
|
||||
sleep 1
|
||||
speed 1.0
|
||||
refreshspeed 0
|
||||
|
||||
#
|
||||
# CORE ROTATION OPTIONS
|
||||
#
|
||||
rotate 1
|
||||
ror 0
|
||||
rol 0
|
||||
autoror 0
|
||||
autorol 0
|
||||
flipx 0
|
||||
flipy 0
|
||||
|
||||
#
|
||||
# CORE ARTWORK OPTIONS
|
||||
#
|
||||
artwork_crop 0
|
||||
use_backdrops 1
|
||||
use_overlays 1
|
||||
use_bezels 1
|
||||
|
||||
#
|
||||
# CORE SCREEN OPTIONS
|
||||
#
|
||||
brightness 1.0
|
||||
contrast 1.0
|
||||
gamma 1.0
|
||||
pause_brightness 0.65
|
||||
|
||||
#
|
||||
# CORE VECTOR OPTIONS
|
||||
#
|
||||
antialias 1
|
||||
beam 1.0
|
||||
flicker 0
|
||||
|
||||
#
|
||||
# CORE SOUND OPTIONS
|
||||
#
|
||||
sound 1
|
||||
samplerate 48000
|
||||
samples 1
|
||||
volume 0
|
||||
|
||||
#
|
||||
# CORE INPUT OPTIONS
|
||||
#
|
||||
coin_lockout 1
|
||||
ctrlr
|
||||
mouse 0
|
||||
joystick 1
|
||||
lightgun 0
|
||||
multikeyboard 0
|
||||
multimouse 0
|
||||
steadykey 0
|
||||
offscreen_reload 0
|
||||
joystick_map auto
|
||||
joystick_deadzone 0.3
|
||||
joystick_saturation 0.85
|
||||
natural 0
|
||||
uimodekey auto
|
||||
|
||||
#
|
||||
# CORE INPUT AUTOMATIC ENABLE OPTIONS
|
||||
#
|
||||
paddle_device keyboard
|
||||
adstick_device keyboard
|
||||
pedal_device keyboard
|
||||
dial_device keyboard
|
||||
trackball_device keyboard
|
||||
lightgun_device keyboard
|
||||
positional_device keyboard
|
||||
mouse_device mouse
|
||||
|
||||
#
|
||||
# CORE DEBUGGING OPTIONS
|
||||
#
|
||||
log 0
|
||||
verbose 0
|
||||
update_in_pause 0
|
||||
debug 0
|
||||
debugscript
|
||||
debug_internal 0
|
||||
|
||||
#
|
||||
# CORE MISC OPTIONS
|
||||
#
|
||||
bios
|
||||
cheat 0
|
||||
skip_gameinfo 0
|
||||
|
||||
#
|
||||
# DEBUGGING OPTIONS
|
||||
#
|
||||
oslog 0
|
||||
|
||||
#
|
||||
# PERFORMANCE OPTIONS
|
||||
#
|
||||
multithreading 0
|
||||
numprocessors auto
|
||||
sdlvideofps 0
|
||||
|
||||
#
|
||||
# VIDEO OPTIONS
|
||||
#
|
||||
video soft
|
||||
numscreens 1
|
||||
window 0
|
||||
maximize 1
|
||||
keepaspect 1
|
||||
unevenstretch 1
|
||||
effect none
|
||||
centerh 1
|
||||
centerv 1
|
||||
waitvsync 0
|
||||
scalemode none
|
||||
|
||||
#
|
||||
# OpenGL-SPECIFIC OPTIONS
|
||||
#
|
||||
filter 1
|
||||
prescale 1
|
||||
gl_forcepow2texture 0
|
||||
gl_notexturerect 0
|
||||
gl_vbo 1
|
||||
gl_pbo 1
|
||||
gl_glsl 0
|
||||
gl_glsl_filter 1
|
||||
glsl_shader_mame0 none
|
||||
glsl_shader_mame1 none
|
||||
glsl_shader_mame2 none
|
||||
glsl_shader_mame3 none
|
||||
glsl_shader_mame4 none
|
||||
glsl_shader_mame5 none
|
||||
glsl_shader_mame6 none
|
||||
glsl_shader_mame7 none
|
||||
glsl_shader_mame8 none
|
||||
glsl_shader_mame9 none
|
||||
glsl_shader_screen0 none
|
||||
glsl_shader_screen1 none
|
||||
glsl_shader_screen2 none
|
||||
glsl_shader_screen3 none
|
||||
glsl_shader_screen4 none
|
||||
glsl_shader_screen5 none
|
||||
glsl_shader_screen6 none
|
||||
glsl_shader_screen7 none
|
||||
glsl_shader_screen8 none
|
||||
glsl_shader_screen9 none
|
||||
gl_glsl_vid_attr 1
|
||||
|
||||
#
|
||||
# PER-WINDOW VIDEO OPTIONS
|
||||
#
|
||||
screen auto
|
||||
aspect auto
|
||||
resolution auto
|
||||
view auto
|
||||
screen0 auto
|
||||
aspect0 auto
|
||||
resolution0 auto
|
||||
view0 auto
|
||||
screen1 auto
|
||||
aspect1 auto
|
||||
resolution1 auto
|
||||
view1 auto
|
||||
screen2 auto
|
||||
aspect2 auto
|
||||
resolution2 auto
|
||||
view2 auto
|
||||
screen3 auto
|
||||
aspect3 auto
|
||||
resolution3 auto
|
||||
view3 auto
|
||||
|
||||
#
|
||||
# FULL SCREEN OPTIONS
|
||||
#
|
||||
switchres 0
|
||||
useallheads 0
|
||||
|
||||
#
|
||||
# SOUND OPTIONS
|
||||
#
|
||||
audio_latency 3
|
||||
|
||||
#
|
||||
# SDL KEYBOARD MAPPING
|
||||
#
|
||||
keymap 0
|
||||
keymap_file $HOME/.sdlmame/keymap.dat
|
||||
#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-be.txt
|
||||
#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-ch.txt
|
||||
#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-de.txt
|
||||
#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-fr.txt
|
||||
#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km_it.txt
|
||||
|
||||
#
|
||||
# SDL JOYSTICK MAPPING
|
||||
#
|
||||
joy_idx1 auto
|
||||
joy_idx2 auto
|
||||
joy_idx3 auto
|
||||
joy_idx4 auto
|
||||
joy_idx5 auto
|
||||
joy_idx6 auto
|
||||
joy_idx7 auto
|
||||
joy_idx8 auto
|
||||
sixaxis 0
|
||||
|
||||
#
|
||||
# SDL LOWLEVEL DRIVER OPTIONS
|
||||
#
|
||||
videodriver auto
|
||||
audiodriver auto
|
||||
gl_lib auto
|
||||
@@ -1,79 +0,0 @@
|
||||
--- work.orig/makefile 2011-11-09 22:40:30.000000000 -0500
|
||||
+++ work/makefile 2011-11-16 19:24:24.615419949 -0500
|
||||
@@ -435,9 +435,6 @@
|
||||
CPPONLYFLAGS += -x c++ -std=gnu++98
|
||||
COBJFLAGS += -x objective-c++
|
||||
|
||||
-# this speeds it up a bit by piping between the preprocessor/compiler/assembler
|
||||
-CCOMFLAGS += -pipe
|
||||
-
|
||||
# add -g if we need symbols, and ensure we have frame pointers
|
||||
ifdef SYMBOLS
|
||||
CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
|
||||
@@ -442,7 +442,6 @@
|
||||
|
||||
# add -v if we need verbose build information
|
||||
ifdef VERBOSE
|
||||
-CCOMFLAGS += -v
|
||||
endif
|
||||
|
||||
# add profiling information for the compiler
|
||||
@@ -453,23 +450,6 @@
|
||||
CCOMFLAGS += -pg
|
||||
endif
|
||||
|
||||
-# add the optimization flag
|
||||
-CCOMFLAGS += -O$(OPTIMIZE)
|
||||
-
|
||||
-# if we are optimizing, include optimization options
|
||||
-# and make all errors into warnings
|
||||
-ifneq ($(OPTIMIZE),0)
|
||||
-ifneq ($(TARGETOS),os2)
|
||||
-ifndef NOWERROR
|
||||
-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
|
||||
-else
|
||||
-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
|
||||
-endif
|
||||
-else
|
||||
-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
# add a basic set of warnings
|
||||
CCOMFLAGS += \
|
||||
-Wall \
|
||||
@@ -524,20 +504,6 @@
|
||||
endif
|
||||
|
||||
|
||||
-#-------------------------------------------------
|
||||
-# linking flags
|
||||
-#-------------------------------------------------
|
||||
-
|
||||
-# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
|
||||
-# flags only used when linking the core emulator
|
||||
-LDFLAGS =
|
||||
-ifneq ($(TARGETOS),macosx)
|
||||
-ifneq ($(TARGETOS),os2)
|
||||
-ifneq ($(TARGETOS),solaris)
|
||||
-LDFLAGS = -Wl,--warn-common
|
||||
-endif
|
||||
-endif
|
||||
-endif
|
||||
LDFLAGSEMULATOR =
|
||||
|
||||
# add profiling information for the linker
|
||||
@@ -545,13 +511,6 @@
|
||||
LDFLAGS += -pg
|
||||
endif
|
||||
|
||||
-# strip symbols and other metadata in non-symbols and non profiling builds
|
||||
-ifndef SYMBOLS
|
||||
-ifneq ($(TARGETOS),macosx)
|
||||
-LDFLAGS += -s
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
# output a map file (emulator only)
|
||||
ifdef MAP
|
||||
LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map
|
||||
@@ -1,11 +0,0 @@
|
||||
--- ./src/osd/sdl/osdsdl.h.orig
|
||||
+++ ./src/osd/sdl/osdsdl.h
|
||||
@@ -225,6 +225,8 @@
|
||||
const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
|
||||
#if USE_OPENGL
|
||||
const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
|
||||
+#else
|
||||
+ const char *gl_lib() const { return NULL; }
|
||||
#endif
|
||||
|
||||
private:
|
||||
@@ -1,177 +0,0 @@
|
||||
--- makefile
|
||||
+++ makefile
|
||||
@@ -314,13 +314,14 @@
|
||||
endif
|
||||
|
||||
# compiler, linker and utilities
|
||||
-AR = @ar
|
||||
-CC = @gcc
|
||||
-LD = @g++
|
||||
+AR ?= @ar
|
||||
+CC ?= @gcc
|
||||
+CXX ?= @g++
|
||||
+LD = $(CXX)
|
||||
MD = -mkdir$(EXE)
|
||||
RM = @rm -f
|
||||
OBJDUMP = @objdump
|
||||
-PYTHON = @python
|
||||
+PYTHON ?= @python
|
||||
|
||||
|
||||
#-------------------------------------------------
|
||||
@@ -455,7 +456,7 @@
|
||||
|
||||
# CFLAGS is defined based on C or C++ targets
|
||||
# (remember, expansion only happens when used, so doing it here is ok)
|
||||
-CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
|
||||
+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
|
||||
|
||||
# we compile C-only to C89 standard with GNU extensions
|
||||
# we compile C++ code to C++98 standard with GNU extensions
|
||||
@@ -463,9 +464,6 @@
|
||||
CPPONLYFLAGS += -x c++ -std=gnu++98
|
||||
COBJFLAGS += -x objective-c++
|
||||
|
||||
-# this speeds it up a bit by piping between the preprocessor/compiler/assembler
|
||||
-CCOMFLAGS += -pipe
|
||||
-
|
||||
# add -g if we need symbols, and ensure we have frame pointers
|
||||
ifdef SYMBOLS
|
||||
CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
|
||||
@@ -479,19 +477,6 @@
|
||||
# add profiling information for the compiler
|
||||
ifdef PROFILE
|
||||
CCOMFLAGS += -pg
|
||||
-endif
|
||||
-
|
||||
-# add the optimization flag
|
||||
-CCOMFLAGS += -O$(OPTIMIZE)
|
||||
-
|
||||
-# add the error warning flag
|
||||
-ifndef NOWERROR
|
||||
-CCOMFLAGS += -Werror
|
||||
-endif
|
||||
-
|
||||
-# if we are optimizing, include optimization options
|
||||
-ifneq ($(OPTIMIZE),0)
|
||||
-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
|
||||
endif
|
||||
|
||||
# add a basic set of warnings
|
||||
@@ -565,26 +550,11 @@
|
||||
|
||||
# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
|
||||
# flags only used when linking the core emulator
|
||||
-LDFLAGS =
|
||||
-ifneq ($(TARGETOS),macosx)
|
||||
-ifneq ($(TARGETOS),os2)
|
||||
-ifneq ($(TARGETOS),solaris)
|
||||
-LDFLAGS = -Wl,--warn-common
|
||||
-endif
|
||||
-endif
|
||||
-endif
|
||||
LDFLAGSEMULATOR =
|
||||
|
||||
# add profiling information for the linker
|
||||
ifdef PROFILE
|
||||
LDFLAGS += -pg
|
||||
-endif
|
||||
-
|
||||
-# strip symbols and other metadata in non-symbols and non profiling builds
|
||||
-ifndef SYMBOLS
|
||||
-ifneq ($(TARGETOS),macosx)
|
||||
-LDFLAGS += -s
|
||||
-endif
|
||||
endif
|
||||
|
||||
# output a map file (emulator only)
|
||||
--- src/osd/sdl/sdl.mak
|
||||
+++ src/osd/sdl/sdl.mak
|
||||
@@ -24,6 +24,8 @@
|
||||
# uncomment and edit next line to specify a distribution
|
||||
# supported debian-stable, ubuntu-intrepid
|
||||
|
||||
+PKG_CONFIG ?= pkg-config
|
||||
+
|
||||
# DISTRO = debian-stable
|
||||
# DISTRO = ubuntu-intrepid
|
||||
# DISTRO = gcc44-generic
|
||||
@@ -91,9 +93,9 @@
|
||||
endif
|
||||
|
||||
ifdef SDL_INSTALL_ROOT
|
||||
-SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
|
||||
+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
|
||||
else
|
||||
-SDL_CONFIG = $(SDL_LIBVER)-config
|
||||
+SDL_CONFIG ?= $(SDL_LIBVER)-config
|
||||
endif
|
||||
|
||||
ifeq ($(SDL_LIBVER),sdl2)
|
||||
@@ -190,8 +192,8 @@
|
||||
SDL_NETWORK = taptun
|
||||
|
||||
ifndef NO_USE_MIDI
|
||||
-INCPATH += `pkg-config --cflags alsa`
|
||||
-LIBS += `pkg-config --libs alsa`
|
||||
+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa)
|
||||
+LIBS += $(shell $(PKG_CONFIG) --libs alsa)
|
||||
endif
|
||||
|
||||
endif
|
||||
@@ -476,10 +478,10 @@
|
||||
# Remove the "/SDL" component from the include path so that we can compile
|
||||
# files (header files are #include "SDL/something.h", so the extra "/SDL"
|
||||
# causes a significant problem)
|
||||
-INCPATH += `sdl-config --cflags | sed 's:/SDL::'`
|
||||
+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::')
|
||||
CCOMFLAGS += -DNO_SDL_GLEXT
|
||||
# Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m
|
||||
-LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread
|
||||
+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread
|
||||
DEFS += -DMACOSX_USE_LIBSDL
|
||||
endif # MACOSX_USE_LIBSDL
|
||||
|
||||
@@ -532,8 +534,8 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-INCPATH += `pkg-config --cflags fontconfig`
|
||||
-LIBS += `pkg-config --libs fontconfig`
|
||||
+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig)
|
||||
+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig)
|
||||
|
||||
ifeq ($(SDL_LIBVER),sdl2)
|
||||
LIBS += -lSDL2_ttf
|
||||
@@ -616,8 +618,8 @@
|
||||
|
||||
ifeq ($(BASE_TARGETOS),os2)
|
||||
|
||||
-INCPATH += `sdl-config --cflags`
|
||||
-LIBS += `sdl-config --libs`
|
||||
+INCPATH += $(shell $(SDL_CONFIG) --cflags)
|
||||
+LIBS += $(shell $(SDL_CONFIG) --libs)
|
||||
|
||||
endif # OS2
|
||||
|
||||
@@ -690,15 +692,15 @@
|
||||
|
||||
# the new debugger relies on GTK+ in addition to the base SDLMAME needs
|
||||
# Non-X11 builds can not use the debugger
|
||||
-INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
|
||||
-CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
|
||||
-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
|
||||
+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
|
||||
+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
|
||||
+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
|
||||
#CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
|
||||
|
||||
# The newer debugger uses QT
|
||||
ifdef USE_QTDEBUG
|
||||
-INCPATH += `pkg-config QtGui --cflags`
|
||||
-LIBS += `pkg-config QtGui --libs`
|
||||
+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
|
||||
+LIBS += $(shell $(PKG_CONFIG) QtGui --libs)
|
||||
endif
|
||||
|
||||
# some systems still put important things in a different prefix
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -Naur a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
|
||||
--- a/src/osd/sdl/osdsdl.h 2012-07-11 20:49:55.070264487 +0200
|
||||
+++ b/src/osd/sdl/osdsdl.h 2012-07-11 20:51:45.976264395 +0200
|
||||
@@ -216,6 +216,8 @@
|
||||
const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
|
||||
#if USE_OPENGL
|
||||
const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
|
||||
+#else
|
||||
+ const char *gl_lib() const { return NULL; }
|
||||
#endif
|
||||
|
||||
private:
|
||||
@@ -1,191 +0,0 @@
|
||||
commit 938cfdf1f01bcc9ac736249ee6458a774d560738
|
||||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Tue Jun 25 23:48:02 2013 +0200
|
||||
|
||||
QA: respect several environment variables
|
||||
|
||||
such as CC,CFLAGS,PKG_CONFIG...
|
||||
|
||||
diff --git a/makefile b/makefile
|
||||
index ad6ae2d..dd4598d 100644
|
||||
--- a/makefile
|
||||
+++ b/makefile
|
||||
@@ -317,13 +317,15 @@ BUILD_EXE = $(EXE)
|
||||
endif
|
||||
|
||||
# compiler, linker and utilities
|
||||
-AR = @ar
|
||||
-CC = @gcc
|
||||
-LD = @g++
|
||||
+AR ?= @ar
|
||||
+CC ?= @gcc
|
||||
+CXX ?= @g++
|
||||
+LD = $(CXX)
|
||||
MD = -mkdir$(EXE)
|
||||
RM = @rm -f
|
||||
OBJDUMP = @objdump
|
||||
-PYTHON = @python
|
||||
+PYTHON ?= @python
|
||||
+PKG_CONFIG ?= pkg-config
|
||||
|
||||
|
||||
#-------------------------------------------------
|
||||
@@ -458,7 +460,7 @@ CPPONLYFLAGS =
|
||||
|
||||
# CFLAGS is defined based on C or C++ targets
|
||||
# (remember, expansion only happens when used, so doing it here is ok)
|
||||
-CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
|
||||
+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
|
||||
|
||||
# we compile C-only to C89 standard with GNU extensions
|
||||
# we compile C++ code to C++98 standard with GNU extensions
|
||||
@@ -466,9 +468,6 @@ CONLYFLAGS += -std=gnu89
|
||||
CPPONLYFLAGS += -x c++ -std=gnu++98
|
||||
COBJFLAGS += -x objective-c++
|
||||
|
||||
-# this speeds it up a bit by piping between the preprocessor/compiler/assembler
|
||||
-CCOMFLAGS += -pipe
|
||||
-
|
||||
# add -g if we need symbols, and ensure we have frame pointers
|
||||
ifdef SYMBOLS
|
||||
CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
|
||||
@@ -484,19 +483,6 @@ ifdef PROFILE
|
||||
CCOMFLAGS += -pg
|
||||
endif
|
||||
|
||||
-# add the optimization flag
|
||||
-CCOMFLAGS += -O$(OPTIMIZE)
|
||||
-
|
||||
-# add the error warning flag
|
||||
-ifndef NOWERROR
|
||||
-CCOMFLAGS += -Werror
|
||||
-endif
|
||||
-
|
||||
-# if we are optimizing, include optimization options
|
||||
-ifneq ($(OPTIMIZE),0)
|
||||
-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
|
||||
-endif
|
||||
-
|
||||
# add a basic set of warnings
|
||||
CCOMFLAGS += \
|
||||
-Wall \
|
||||
@@ -576,14 +562,6 @@ endif
|
||||
|
||||
# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
|
||||
# flags only used when linking the core emulator
|
||||
-LDFLAGS =
|
||||
-ifneq ($(TARGETOS),macosx)
|
||||
-ifneq ($(TARGETOS),os2)
|
||||
-ifneq ($(TARGETOS),solaris)
|
||||
-LDFLAGS = -Wl,--warn-common
|
||||
-endif
|
||||
-endif
|
||||
-endif
|
||||
LDFLAGSEMULATOR =
|
||||
|
||||
# add profiling information for the linker
|
||||
@@ -591,13 +569,6 @@ ifdef PROFILE
|
||||
LDFLAGS += -pg
|
||||
endif
|
||||
|
||||
-# strip symbols and other metadata in non-symbols and non profiling builds
|
||||
-ifndef SYMBOLS
|
||||
-ifneq ($(TARGETOS),macosx)
|
||||
-LDFLAGS += -s
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
# output a map file (emulator only)
|
||||
ifdef MAP
|
||||
LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map
|
||||
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
|
||||
index 84332ef..36655d3 100644
|
||||
--- a/src/osd/sdl/sdl.mak
|
||||
+++ b/src/osd/sdl/sdl.mak
|
||||
@@ -24,6 +24,8 @@
|
||||
# uncomment and edit next line to specify a distribution
|
||||
# supported debian-stable, ubuntu-intrepid
|
||||
|
||||
+PKG_CONFIG ?= pkg-config
|
||||
+
|
||||
# DISTRO = debian-stable
|
||||
# DISTRO = ubuntu-intrepid
|
||||
# DISTRO = gcc44-generic
|
||||
@@ -88,9 +90,9 @@ SDL_LIBVER = sdl
|
||||
endif
|
||||
|
||||
ifdef SDL_INSTALL_ROOT
|
||||
-SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
|
||||
+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
|
||||
else
|
||||
-SDL_CONFIG = $(SDL_LIBVER)-config
|
||||
+SDL_CONFIG ?= $(SDL_LIBVER)-config
|
||||
endif
|
||||
|
||||
ifeq ($(SDL_LIBVER),sdl2)
|
||||
@@ -187,8 +189,8 @@ SYNC_IMPLEMENTATION = tc
|
||||
SDL_NETWORK = taptun
|
||||
|
||||
ifndef NO_USE_MIDI
|
||||
-INCPATH += `pkg-config --cflags alsa`
|
||||
-LIBS += `pkg-config --libs alsa`
|
||||
+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa)
|
||||
+LIBS += $(shell $(PKG_CONFIG) --libs alsa)
|
||||
endif
|
||||
|
||||
endif
|
||||
@@ -478,10 +480,10 @@ else
|
||||
# Remove the "/SDL" component from the include path so that we can compile
|
||||
# files (header files are #include "SDL/something.h", so the extra "/SDL"
|
||||
# causes a significant problem)
|
||||
-INCPATH += `sdl-config --cflags | sed 's:/SDL::'`
|
||||
+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::')
|
||||
CCOMFLAGS += -DNO_SDL_GLEXT
|
||||
# Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m
|
||||
-LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread
|
||||
+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread
|
||||
DEFS += -DMACOSX_USE_LIBSDL
|
||||
endif # MACOSX_USE_LIBSDL
|
||||
|
||||
@@ -534,8 +536,8 @@ INCPATH += -I$(SDL_INSTALL_ROOT)/include/directfb
|
||||
endif
|
||||
endif
|
||||
|
||||
-INCPATH += `pkg-config --cflags fontconfig`
|
||||
-LIBS += `pkg-config --libs fontconfig`
|
||||
+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig)
|
||||
+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig)
|
||||
|
||||
ifeq ($(SDL_LIBVER),sdl2)
|
||||
LIBS += -lSDL2_ttf
|
||||
@@ -620,8 +622,8 @@ endif # Win32
|
||||
|
||||
ifeq ($(BASE_TARGETOS),os2)
|
||||
|
||||
-INCPATH += `sdl-config --cflags`
|
||||
-LIBS += `sdl-config --libs`
|
||||
+INCPATH += $(shell $(SDL_CONFIG) --cflags)
|
||||
+LIBS += $(shell $(SDL_CONFIG) --libs)
|
||||
|
||||
endif # OS2
|
||||
|
||||
@@ -696,14 +698,14 @@ LIBS += -lX11 -lXinerama
|
||||
|
||||
# The newer debugger uses QT
|
||||
ifndef NO_USE_QTDEBUG
|
||||
-INCPATH += `pkg-config QtGui --cflags`
|
||||
-LIBS += `pkg-config QtGui --libs`
|
||||
+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
|
||||
+LIBS += $(shell $(PKG_CONFIG) QtGui --libs)
|
||||
else
|
||||
# the old-new debugger relies on GTK+ in addition to the base SDLMAME needs
|
||||
# Non-X11 builds can not use the debugger
|
||||
-INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
|
||||
-CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
|
||||
-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
|
||||
+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
|
||||
+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
|
||||
+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
|
||||
endif
|
||||
|
||||
# some systems still put important things in a different prefix
|
||||
@@ -1,28 +0,0 @@
|
||||
commit ec92ac2b0180b101c30748e62eb8b76cdf0cb439
|
||||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Wed Jun 26 14:33:01 2013 +0200
|
||||
|
||||
remove unneeded linking
|
||||
|
||||
if we don't build the debugger, we don't want gtk+ linking
|
||||
|
||||
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
|
||||
index 36655d3..2089707 100644
|
||||
--- a/src/osd/sdl/sdl.mak
|
||||
+++ b/src/osd/sdl/sdl.mak
|
||||
@@ -696,6 +696,7 @@ else
|
||||
DEFS += -DSDLMAME_X11
|
||||
LIBS += -lX11 -lXinerama
|
||||
|
||||
+ifneq ($(NO_DEBUGGER),1)
|
||||
# The newer debugger uses QT
|
||||
ifndef NO_USE_QTDEBUG
|
||||
INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
|
||||
@@ -707,6 +708,7 @@ INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
|
||||
CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
|
||||
LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
|
||||
endif
|
||||
+endif # NO_DEBUGGER
|
||||
|
||||
# some systems still put important things in a different prefix
|
||||
LIBS += -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib
|
||||
@@ -1,19 +0,0 @@
|
||||
commit 6ee372b3693857372a7b4855039ad1a94d3aebca
|
||||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Tue Jun 25 23:51:12 2013 +0200
|
||||
|
||||
fix for disabled opengl
|
||||
|
||||
diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
|
||||
index ed0b66b..03d68f9 100644
|
||||
--- a/src/osd/sdl/osdsdl.h
|
||||
+++ b/src/osd/sdl/osdsdl.h
|
||||
@@ -219,6 +219,8 @@ public:
|
||||
const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
|
||||
#if USE_OPENGL
|
||||
const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
|
||||
+#else
|
||||
+ const char *gl_lib() const { return NULL; }
|
||||
#endif
|
||||
|
||||
private:
|
||||
@@ -1,33 +0,0 @@
|
||||
commit ea514c9ded266aa365976649d88fa5593ef7ebf5
|
||||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Tue Jun 25 23:48:26 2013 +0200
|
||||
|
||||
add switch to use system lua
|
||||
|
||||
diff --git a/makefile b/makefile
|
||||
index dd4598d..bdf22d2 100644
|
||||
--- a/makefile
|
||||
+++ b/makefile
|
||||
@@ -228,6 +228,9 @@ BUILD_JPEGLIB = 1
|
||||
# uncomment next line to build PortMidi as part of MAME/MESS build
|
||||
BUILD_MIDILIB = 1
|
||||
|
||||
+# uncomment next line to build Lua-5.2 as part of MAME/MESS build
|
||||
+BUILD_LUA = 1
|
||||
+
|
||||
# uncomment next line to include the symbols
|
||||
# SYMBOLS = 1
|
||||
|
||||
@@ -664,7 +667,12 @@ SOFTFLOAT = $(OBJ)/libsoftfloat.a
|
||||
FORMATS_LIB = $(OBJ)/libformats.a
|
||||
|
||||
# add LUA library
|
||||
+ifeq ($(BUILD_LUA),1)
|
||||
LUA_LIB = $(OBJ)/liblua.a
|
||||
+else
|
||||
+LIBS += $(shell $(PKG_CONFIG) --libs lua)
|
||||
+INCPATH += $(shell $(PKG_CONFIG) --cflags lua)
|
||||
+endif
|
||||
|
||||
# add PortMidi MIDI library
|
||||
ifeq ($(BUILD_MIDILIB),1)
|
||||
@@ -1,9 +0,0 @@
|
||||
#
|
||||
# Specific options file for vector games
|
||||
#
|
||||
|
||||
#
|
||||
# VIDEO OPTIONS
|
||||
#
|
||||
video soft
|
||||
yuvmode yv12
|
||||
Reference in New Issue
Block a user