This commit is contained in:
parent
372e2e91b0
commit
c2939f22bb
|
|
@ -7,7 +7,7 @@ include(FindPackageHandleStandardArgs)
|
||||||
option(STEAM "Build for Steam" OFF)
|
option(STEAM "Build for Steam" OFF)
|
||||||
set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
|
set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
|
||||||
option(DEBUG "Debug mode" ON)
|
option(DEBUG "Debug mode" ON)
|
||||||
|
set(SDLTTF_VENDORED ON)
|
||||||
## Misc setup ##
|
## Misc setup ##
|
||||||
|
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
|
|
|
||||||
|
|
@ -86,8 +86,7 @@ namespace Buffer{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Source
|
namespace Source{
|
||||||
{
|
|
||||||
DEF_AL_ID
|
DEF_AL_ID
|
||||||
|
|
||||||
inline Source::ID gen(){
|
inline Source::ID gen(){
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct ALDataSource{
|
struct ALDataSource{
|
||||||
enum Status
|
enum Status{
|
||||||
{
|
|
||||||
NoError,
|
NoError,
|
||||||
EndOfStream,
|
EndOfStream,
|
||||||
WrapAround,
|
WrapAround,
|
||||||
|
|
|
||||||
|
|
@ -34,10 +34,8 @@ struct ALDataSource;
|
||||||
|
|
||||||
/* State-machine like audio playback stream.
|
/* State-machine like audio playback stream.
|
||||||
* This class is NOT thread safe */
|
* This class is NOT thread safe */
|
||||||
struct ALStream
|
struct ALStream{
|
||||||
{
|
enum State{
|
||||||
enum State
|
|
||||||
{
|
|
||||||
Closed,
|
Closed,
|
||||||
Stopped,
|
Stopped,
|
||||||
Playing,
|
Playing,
|
||||||
|
|
@ -77,14 +75,12 @@ struct ALStream
|
||||||
// made it pointer, idk if its right. never worked with SDL
|
// made it pointer, idk if its right. never worked with SDL
|
||||||
SDL_IOStream* srcOps;
|
SDL_IOStream* srcOps;
|
||||||
|
|
||||||
struct
|
struct{
|
||||||
{
|
|
||||||
ALenum format;
|
ALenum format;
|
||||||
ALsizei freq;
|
ALsizei freq;
|
||||||
} stream;
|
} stream;
|
||||||
|
|
||||||
enum LoopMode
|
enum LoopMode{
|
||||||
{
|
|
||||||
Looped,
|
Looped,
|
||||||
NotLooped
|
NotLooped
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,7 @@
|
||||||
struct FileSystemPrivate;
|
struct FileSystemPrivate;
|
||||||
class SharedFontState;
|
class SharedFontState;
|
||||||
|
|
||||||
class FileSystem
|
class FileSystem{
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
FileSystem(bool allowSymlinks);
|
FileSystem(bool allowSymlinks);
|
||||||
~FileSystem();
|
~FileSystem();
|
||||||
|
|
@ -42,8 +41,7 @@ public:
|
||||||
* available font assets */
|
* available font assets */
|
||||||
void initFontSets(SharedFontState &sfs);
|
void initFontSets(SharedFontState &sfs);
|
||||||
|
|
||||||
struct OpenHandler
|
struct OpenHandler{
|
||||||
{
|
|
||||||
/* Try to read and interpret data provided from ops.
|
/* Try to read and interpret data provided from ops.
|
||||||
* If data cannot be parsed, return false, otherwise true.
|
* If data cannot be parsed, return false, otherwise true.
|
||||||
* Can be called multiple times until a parseable file is found.
|
* Can be called multiple times until a parseable file is found.
|
||||||
|
|
|
||||||
|
|
@ -354,7 +354,7 @@ void Font::initDefaultDynAttribs(){
|
||||||
|
|
||||||
void Font::initDefaults(const SharedFontState &sfs){
|
void Font::initDefaults(const SharedFontState &sfs){
|
||||||
std::vector<std::string> &names = FontPrivate::initialDefaultNames;
|
std::vector<std::string> &names = FontPrivate::initialDefaultNames;
|
||||||
|
|
||||||
switch (rgssVer){
|
switch (rgssVer){
|
||||||
case 1 :
|
case 1 :
|
||||||
// FIXME: Japanese version has "MS PGothic" instead
|
// FIXME: Japanese version has "MS PGothic" instead
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,7 @@ struct Config;
|
||||||
|
|
||||||
struct SharedFontStatePrivate;
|
struct SharedFontStatePrivate;
|
||||||
|
|
||||||
class SharedFontState
|
class SharedFontState{
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
SharedFontState(const Config &conf);
|
SharedFontState(const Config &conf);
|
||||||
~SharedFontState();
|
~SharedFontState();
|
||||||
|
|
@ -60,8 +59,7 @@ private:
|
||||||
|
|
||||||
struct FontPrivate;
|
struct FontPrivate;
|
||||||
|
|
||||||
class Font
|
class Font{
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
static bool doesExist(const char *name);
|
static bool doesExist(const char *name);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,11 @@ set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../steamworks" CACHE PATH "Path
|
||||||
set(GAME_LAUNCH_NAME "oneshot" CACHE STRING "Game launch name")
|
set(GAME_LAUNCH_NAME "oneshot" CACHE STRING "Game launch name")
|
||||||
option(DEBUG "Debug mode" OFF)
|
option(DEBUG "Debug mode" OFF)
|
||||||
|
|
||||||
|
if(DEBUG)
|
||||||
|
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g3 -O0 -fno-omit-frame-pointer -ggdb")
|
||||||
|
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g3 -O0 -fno-omit-frame-pointer -ggdb")
|
||||||
|
endif()
|
||||||
|
|
||||||
set(SOURCES
|
set(SOURCES
|
||||||
steamshim_parent.cpp
|
steamshim_parent.cpp
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue