mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmake build

This commit is contained in:
zsilencer 2014-09-05 19:56:42 -06:00
parent 04a2d27c9a
commit 02cacd45c1
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -24,11 +24,14 @@ set (ORCT2_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT}/)
project(${PROJECT})
add_definitions(-DORCT2_RESOURCE_DIR="${ORCT2_RESOURCE_DIR}")
add_definitions(-DHAVE_CONFIG_H)
# include lodepng header
include_directories("lodepng/")
# include speex header
include_directories("libspeex/")
# add source files
file(GLOB_RECURSE ORCT2_SOURCES "src/*.c" "lodepng/*.c")
file(GLOB_RECURSE ORCT2_SOURCES "src/*.c" "src/*.cpp" "libspeex/*.c" "lodepng/*.c")
if (UNIX)
# force 32bit build for now and set necessary flags to compile code as is

2
src/config.h
View File

@ -133,7 +133,7 @@ typedef struct general_configuration {
uint16 language;
} general_configuration_t;
static const struct { char *key; int value; } _currencyLookupTable[] = {
static const struct { const char *key; int value; } _currencyLookupTable[] = {
{ "GBP", CURRENCY_POUNDS },
{ "USD", CURRENCY_DOLLARS },
{ "FRF", CURRENCY_FRANC },

2
src/mixer.cpp
View File

@ -362,7 +362,7 @@ void Mixer::MixChannel(Channel& channel, Uint8* data, int length)
}
channel.offset = 0;
}
} while(loaded < length || (loaded < length && channel.loop != 0 && channel.offset == 0));
} while(loaded < length && channel.loop != 0);
}
}