summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Scott Stone <tafoid@gmail.com>2016-03-30 00:38:08 -0400
committer Scott Stone <tafoid@gmail.com>2016-03-30 00:38:08 -0400
commit28c9be35ea920d8d3ee69d2b3319cd1eadb79167 (patch)
treeab8231db2419cb8300fae5957d2242fbfaebaf04
parentf969f32718cfa0debf385ae784def3004acc27b5 (diff)
Change INIPATH default to cover new HLSL presets (ini/presets) (nw)
-rw-r--r--docs/hlsl.txt2
-rw-r--r--src/emu/emuopts.cpp2
-rw-r--r--src/osd/sdl/sdlmain.cpp2
3 files changed, 2 insertions, 4 deletions
diff --git a/docs/hlsl.txt b/docs/hlsl.txt
index c2868c4200f..db6cfa6def4 100644
--- a/docs/hlsl.txt
+++ b/docs/hlsl.txt
@@ -126,5 +126,3 @@ Presets
../ini/presets/lcd-matrix.ini for screens with STN LCD matrix (rename to lcd.ini or <system>.ini)
../ini/presets/gameboy.ini for Game Boy screen (same as lcd-matrix.ini with greenish color transformation)
../ini/presets/gba.ini for Game Boy Advance screen (same as lcd.ini)
-
-Copy them to ../ini/ to use.
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
index 97c635093ae..8db25068436 100644
--- a/src/emu/emuopts.cpp
+++ b/src/emu/emuopts.cpp
@@ -39,7 +39,7 @@ const options_entry emu_options::s_option_entries[] =
{ OPTION_SAMPLEPATH ";sp", "samples", OPTION_STRING, "path to samplesets" },
{ OPTION_ARTPATH, "artwork", OPTION_STRING, "path to artwork files" },
{ OPTION_CTRLRPATH, "ctrlr", OPTION_STRING, "path to controller definitions" },
- { OPTION_INIPATH, ".;ini", OPTION_STRING, "path to ini files" },
+ { OPTION_INIPATH, ".;ini;ini/presets", OPTION_STRING, "path to ini files" },
{ OPTION_FONTPATH, ".", OPTION_STRING, "path to font files" },
{ OPTION_CHEATPATH, "cheat", OPTION_STRING, "path to cheat files" },
{ OPTION_CROSSHAIRPATH, "crosshair", OPTION_STRING, "path to crosshair files" },
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index ef4c6b7c927..a16f06ba7e1 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -61,7 +61,7 @@
#ifndef INI_PATH
#if defined(SDLMAME_WIN32)
- #define INI_PATH ".;ini"
+ #define INI_PATH ".;ini;ini/presets"
#elif defined(SDLMAME_MACOSX)
#define INI_PATH "$HOME/Library/Application Support/APP_NAME;$HOME/.APP_NAME;.;ini"
#else