From 9cb6b2ada57d30085003cb81ea6bf62e81ee76c8 Mon Sep 17 00:00:00 2001 From: zsilencer Date: Mon, 25 Aug 2014 11:39:01 -0600 Subject: [PATCH] compile fix --- CMakeLists_mingw.txt | 2 +- src/audio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists_mingw.txt b/CMakeLists_mingw.txt index e7fd222dd7..f3df7c65fe 100644 --- a/CMakeLists_mingw.txt +++ b/CMakeLists_mingw.txt @@ -10,7 +10,7 @@ SET(PKG_CONFIG_EXECUTABLE ${COMPILER_PREFIX}-pkg-config) # potential flags to make code more similar to MSVC: # -fshort-wchar -fshort-enums -mms-bitfields # -set(CMAKE_C_FLAGS "-masm=intel -march=pentium -std=gnu99 -fpack-struct=2" CACHE STRING "" FORCE) +set(CMAKE_C_FLAGS "-masm=intel -std=gnu99 -fpack-struct=2" CACHE STRING "" FORCE) set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc" CACHE STRING "" FORCE) # find and include SDL2 diff --git a/src/audio.c b/src/audio.c index ea9758c378..fb6b639d47 100644 --- a/src/audio.c +++ b/src/audio.c @@ -511,7 +511,7 @@ int sound_channel_stop(int channel) rct_sound_channel* sound_channel = &RCT2_ADDRESS(RCT2_ADDRESS_SOUND_CHANNEL_LIST, rct_sound_channel)[channel]; sound_channel->var_0 = 0; sound_channel->var_160 = 1; - while (InterlockedExchange(&RCT2_GLOBAL(0x009E1AAC, LONG), 1) != 1) { + while (_InterlockedExchange(&RCT2_GLOBAL(0x009E1AAC, LONG), 1) != 1) { Sleep(10); } if (sound_channel->var_120) @@ -523,7 +523,7 @@ int sound_channel_stop(int channel) dsbuffer->lpVtbl->Release(dsbuffer); RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel] = 0; } - InterlockedExchange(&RCT2_GLOBAL(0x009E1AAC, LONG), 0); + _InterlockedExchange(&RCT2_GLOBAL(0x009E1AAC, LONG), 0); return 1; }