diff options
| author | aliaspider | 2014-11-26 22:36:10 +0100 |
|---|---|---|
| committer | aliaspider | 2014-11-26 22:36:10 +0100 |
| commit | 66002fa1812ca3f4e6bf9f1a10617e98ff4353e5 (patch) | |
| tree | 7153f58f71cff6fe36f1343ba863b953df0c8ede /source | |
| parent | 238cf4a72fc162adbef4e48f75698ed54ed99369 (diff) | |
| download | snesemu-66002fa1812ca3f4e6bf9f1a10617e98ff4353e5.tar.gz snesemu-66002fa1812ca3f4e6bf9f1a10617e98ff4353e5.tar.bz2 snesemu-66002fa1812ca3f4e6bf9f1a10617e98ff4353e5.zip | |
(windows) another build fix.
Diffstat (limited to 'source')
| -rw-r--r-- | source/apu.c | 6 | ||||
| -rw-r--r-- | source/memmap.c | 11 | ||||
| -rw-r--r-- | source/spc7110.c | 31 |
3 files changed, 3 insertions, 45 deletions
diff --git a/source/apu.c b/source/apu.c index b47ef54..d1142f0 100644 --- a/source/apu.c +++ b/source/apu.c @@ -553,11 +553,7 @@ void S9xFixEnvelope(int channel, uint8_t gain, uint8_t adsr1, uint8_t adsr2) int attack = AttackRate [adsr1 & 0xf]; - if (attack == 1 && (!Settings.SoundSync -#ifdef __WIN32__ - || Settings.SoundDriver != WIN_SNES9X_DIRECT_SOUND_DRIVER -#endif - )) + if (attack == 1 && (!Settings.SoundSync)) attack = 0; S9xSetSoundADSR(channel, attack, diff --git a/source/memmap.c b/source/memmap.c index 2f4ff8a..951c5bb 100644 --- a/source/memmap.c +++ b/source/memmap.c @@ -1486,16 +1486,7 @@ void InitROM(bool Interleaved) Memory.ROMCRC32); S9xMessage(S9X_INFO, S9X_ROM_INFO, String); -#ifdef __WIN32__ -#ifndef _XBOX - EnableMenuItem(GUI.hMenu, IDM_ROM_INFO, MF_ENABLED); -#endif -#ifdef RTC_DEBUGGER - if (Settings.SPC7110RTC) - EnableMenuItem(GUI.hMenu, IDM_7110_RTC, MF_ENABLED); - else EnableMenuItem(GUI.hMenu, IDM_7110_RTC, MF_GRAYED); -#endif -#endif + Settings.ForceHeader = Settings.ForceHiROM = Settings.ForceLoROM = Settings.ForceInterleaved = Settings.ForceNoHeader = Settings.ForceNotInterleaved = diff --git a/source/spc7110.c b/source/spc7110.c index 89cab00..a1b3a45 100644 --- a/source/spc7110.c +++ b/source/spc7110.c @@ -1746,11 +1746,7 @@ void SPC7110Load(char* dirname) Copy7110 = &MovePackData; CleanUp7110 = &Del7110Gfx; -#ifdef __WIN32__ -#ifndef _XBOX - EnableMenuItem(GUI.hMenu, IDM_LOG_7110, MF_ENABLED); -#endif -#endif + } //Cache 2 load function @@ -1791,11 +1787,6 @@ void SPC7110Open(char* dirname) Copy7110 = &ReadPackData; CleanUp7110 = &Close7110Gfx; -#ifdef __WIN32__ -#ifndef _XBOX - EnableMenuItem(GUI.hMenu, IDM_LOG_7110, MF_ENABLED); -#endif -#endif } //Cache 3's load function @@ -1871,11 +1862,6 @@ void SPC7110Grab(char* dirname) CleanUp7110 = &Drop7110Gfx; -#ifdef __WIN32__ -#ifndef _XBOX - EnableMenuItem(GUI.hMenu, IDM_LOG_7110, MF_ENABLED); -#endif -#endif } //Cache 1 clean up function @@ -1884,11 +1870,6 @@ void Del7110Gfx() int i; if (Settings.SPC7110) { -#ifdef __WIN32__ -#ifndef _XBOX - EnableMenuItem(GUI.hMenu, IDM_LOG_7110, MF_GRAYED); -#endif -#endif Do7110Logging(); } for (i = 0; i < MAX_TABLES; i++) @@ -1914,11 +1895,6 @@ void Close7110Gfx() int i; if (Settings.SPC7110) { -#ifdef __WIN32__ -#ifndef _XBOX - EnableMenuItem(GUI.hMenu, IDM_LOG_7110, MF_GRAYED); -#endif -#endif Do7110Logging(); } for (i = 0; i < MAX_TABLES; i++) @@ -1944,11 +1920,6 @@ void Drop7110Gfx() int i; if (Settings.SPC7110) { -#ifdef __WIN32__ -#ifndef _XBOX - EnableMenuItem(GUI.hMenu, IDM_LOG_7110, MF_GRAYED); -#endif -#endif Do7110Logging(); } for (i = 0; i < MAX_TABLES; i++) |