This commit is contained in:
Sebastian Krzyszkowiak 2019-01-11 15:26:12 +01:00
parent 1334fc6b1d
commit ef77bedeae
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
16 changed files with 21 additions and 17 deletions

View file

@ -51,6 +51,7 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
set(CMAKE_CXX_STANDARD 98)
set(CMAKE_CXX_STANDARD_REQUIRED true)
# TODO: add -fvisibility=hidden, but only to libsuperderpy target
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -ffast-math -fstack-protector")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -ffast-math -fstack-protector")

View file

@ -155,4 +155,4 @@ void ShowCharacter(struct Game* game, struct Character* character);
void HideCharacter(struct Game* game, struct Character* character);
bool IsCharacterHidden(struct Game* game, struct Character* character);
#endif
#endif /* LIBSUPERDERPY_CHARACTER_H */

View file

@ -34,4 +34,4 @@ void SetConfigOption(struct Game* game, char* section, char* name, char* value);
/*! \brief Writes config from memory to file. */
void DeinitConfig(struct Game* game);
#endif
#endif /* LIBSUPERDERPY_CONFIG_H */

View file

@ -1,5 +1,5 @@
#ifndef DEFINES_H
#define DEFINES_H
#ifndef LIBSUPERDERPY_DEFINES_H
#define LIBSUPERDERPY_DEFINES_H
/*
* These values are automatically set according to their cmake variables.
@ -8,4 +8,4 @@
#define LIBSUPERDERPY_GAMENAME_PRETTY "${LIBSUPERDERPY_GAMENAME_PRETTY}"
#define LIBSUPERDERPY_GAME_GIT_REV "${LIBSUPERDERPY_GAME_GIT_REV}"
#endif /* DEFINES_H */
#endif /* LIBSUPERDERPY_DEFINES_H */

View file

@ -106,4 +106,4 @@ ALLEGRO_AUDIO_STREAM* emscripten_create_audio_stream(size_t fragment_count, unsi
#define al_set_audio_stream_channel_matrix emscripten_set_audio_stream_channel_matrix
#endif
#endif
#endif /* LIBSUPERDERPY_EMSCRIPTEN_H */

View file

@ -92,4 +92,4 @@ __attribute__((used)) void Gamestate_Unload(struct Game* game, struct GamestateR
__attribute__((used)) void Gamestate_ProcessEvent(struct Game* game, struct GamestateResources* data, ALLEGRO_EVENT* ev);
__attribute__((used)) void Gamestate_Reload(struct Game* game, struct GamestateResources* data);
#endif
#endif /* LIBSUPERDERPY_GAMESTATE_H */

View file

@ -15,7 +15,8 @@
/// \privatesection
#pragma once
#ifndef LIBSUPERDERPY_IMGUI_IMPL_ALLEGRO5_H
#define LIBSUPERDERPY_IMGUI_IMPL_ALLEGRO5_H
#ifdef __cplusplus
#include "3rdparty/cimgui/imgui/imgui.h"
@ -35,3 +36,5 @@ bool ImGui_ImplAllegro5_ProcessEvent(ALLEGRO_EVENT* event);
// Use if you want to reset your rendering device without losing ImGui state.
bool ImGui_ImplAllegro5_CreateDeviceObjects(void);
void ImGui_ImplAllegro5_InvalidateDeviceObjects(void);
#endif /* LIBSUPERDERPY_IMGUI_IMPL_ALLEGRO5_H */

View file

@ -131,4 +131,4 @@ __attribute__((__format__(__printf__, 2, 0))) char* GetGameName(struct Game* gam
ALLEGRO_BITMAP* AddBitmap(struct Game* game, char* filename);
void RemoveBitmap(struct Game* game, char* filename);
#endif
#endif /* LIBSUPERDERPY_INTERNAL_H */

View file

@ -259,4 +259,4 @@ int libsuperderpy_start(struct Game* game);
int libsuperderpy_run(struct Game* game);
void libsuperderpy_destroy(struct Game* game);
#endif
#endif /* LIBSUPERDERPY_MAIN_H */

View file

@ -25,4 +25,4 @@
bool libsuperderpy_mainloop(struct Game* game);
#endif
#endif /* LIBSUPERDERPY_MAINLOOP_H */

View file

@ -31,4 +31,4 @@ double Lerp(double left, double right, double pos);
int Sign(double val);
double Fract(double val);
#endif
#endif /* LIBSUPERDERPY_MATHS_H */

View file

@ -60,4 +60,4 @@ void DrawParticles(struct Game* game, struct ParticleBucket* bucket);
void EmitParticle(struct Game* game, struct ParticleBucket* bucket, struct Character* archetype, ParticleFunc* func, struct ParticleState state, void* data);
void DestroyParticleBucket(struct Game* game, struct ParticleBucket* bucket);
#endif
#endif /* LIBSUPERDERPY_PARTICLE_H */

View file

@ -26,4 +26,4 @@
ALLEGRO_SHADER* CreateShader(struct Game* game, const char* vertex, const char* fragment);
void DestroyShader(struct Game* game, ALLEGRO_SHADER* shader);
#endif
#endif /* LIBSUPERDERPY_SHADER_H */

View file

@ -141,4 +141,4 @@ bool TM_IsBackgroundEmpty(struct Timeline* timeline);
/*! \brief Macro for easy timeline action definition. */
#define TM_ACTION(name) bool name(struct Game* game, struct GamestateResources* data, struct TM_Action* action)
#endif
#endif /* LIBSUPERDERPY_TIMELINE_H */

View file

@ -92,4 +92,4 @@ double GetTweenValue(struct Tween* tween);
void UpdateTween(struct Tween* tween, double delta);
double Interpolate(double pos, TWEEN_STYLE style);
#endif
#endif /* LIBSUPERDERPY_TWEEN_H */

View file

@ -88,4 +88,4 @@ char* PunchNumber(struct Game* game, char* text, char ch, int number);
/*! \brief Quits the game. On platforms that allow it, brings the game to the background without quiting if <allow_pausing> is true. */
void QuitGame(struct Game* game, bool allow_pausing);
#endif
#endif /* LIBSUPERDERPY_UTILS_H */