ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't add gnu99/c99 to CXXFLAGS, should be added to CFLAGS instead 

when appropriate
This commit is contained in:
twinaphex 2017-02-08 06:57:08 +01:00 committed by radius
parent 9f0fb186bf
commit c96bf6bebf
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -112,13 +112,8 @@ else
endif
OBJECTS := NDS.o ARM.o ARMInterpreter.o ARMInterpreter_ALU.o ARMInterpreter_Branch.o ARMInterpreter_LoadStore.o CP15.o DMA.o GPU.o GPU2D.o GPU3D.o NDSCart.o RTC.o SPI.o Wifi.o libretro.o
CXXFLAGS += -I../../libretro-common/include -Wall -pedantic $(fpic)
ifneq (,$(findstring qnx,$(platform)))
CXXFLAGS += -Wc,-std=c99
else
CXXFLAGS += -std=gnu99
endif
CXXFLAGS += -I../../libretro-common/include -Wall -pedantic $(fpic)
CXXFLAGS += -I../../libretro-common/include

20
libretro.cpp
View File

@ -77,19 +77,17 @@ static retro_input_state_t input_state_cb;
void retro_get_system_av_info(struct retro_system_av_info *info)
{
float aspect = 0.0f;
float sampling_rate = 30000.0f;
float aspect = 0.0f;
float sampling_rate = 30000.0f;
info->geometry = (struct retro_game_geometry) {
.base_width = 256,
.base_height = 386,
.max_width = 256,
.max_height = 384,
.aspect_ratio = aspect,
};
info->geometry.base_width = 256;
info->geometry.base_height = 386;
info->geometry.max_width = 256;
info->geometry.max_height = 384;
info->geometry.aspect_ratio = aspect;
last_aspect = aspect;
last_sample_rate = sampling_rate;
last_aspect = aspect;
last_sample_rate = sampling_rate;
}
static struct retro_rumble_interface rumble;