Emulation/mupen64plus-video-rice
1
0
Fork 0
mirror of https://github.com/mupen64plus/mupen64plus-video-rice.git synced 2024-06-12 00:57:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix OSX build warnings/errors

Browse source
This commit is contained in:
Richard Goedeken 2018-01-22 17:43:28 -08:00
parent 31cc0a842f
commit be939e8d00
2 changed files with 3 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
projects/unix/Makefile
View file

@ -160,11 +160,11 @@ ifeq ($(OS), OSX)
ifeq ($(CPU), X86)
ifeq ($(ARCH_DETECTED), 64BITS)
CFLAGS += -pipe -arch x86_64 -mmacosx-version-min=10.5 -isysroot $(OSX_SDK_PATH)
CFLAGS += -pipe -arch x86_64 -mmacosx-version-min=10.6 -isysroot $(OSX_SDK_PATH)
LDFLAGS += -bundle
LDLIBS += -ldl
else
CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.5 -isysroot $(OSX_SDK_PATH)
CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.6 -isysroot $(OSX_SDK_PATH)
LDFLAGS += -bundle
LDLIBS += -ldl
endif

37
src/Config.cpp
View file

@ -56,41 +56,6 @@ const char *frameBufferSettings[] =
"With Emulator Write Only",
};
const int resolutions[][2] =
{
{320, 240},
{400, 300},
{480, 360},
{512, 384},
{640, 480},
{800, 600},
{1024, 768},
{1152, 864},
{1280, 960},
{1400, 1050},
{1600, 1200},
{1920, 1440},
{2048, 1536},
};
const int numberOfResolutions = sizeof(resolutions)/sizeof(int)/2;
const char* resolutionsS[] =
{
"320 x 240",
"400 x 300",
"480 x 360",
"512 x 384",
"640 x 480",
"800 x 600",
"1024 x 768",
"1152 x 864",
"1280 x 960",
"1400 x 1050",
"1600 x 1200",
"1920 x 1440",
"2048 x 1536"
};
const char *frameBufferWriteBackControlSettings[] =
{
"Every Frame (default)",
@ -998,7 +963,7 @@ BOOL ReadIniFile()
if (readinfo[0] == '/')
continue;
if (!strcasecmp(readinfo,"")==0)
if (strlen(readinfo) > 0)
{
if (readinfo[0] == '{') //if a section heading
{