TheCloud/libSDL2pp
1
0
Fork 0
mirror of https://github.com/libSDL2pp/libSDL2pp.git synced 2025-08-04 03:15:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sdlmain'

Browse Source
This commit is contained in:
Dmitry Marakasov 2016-01-05 15:54:32 +03:00
commit 75626243ba
23 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/FindSDL2.cmake
View File

@ -9,6 +9,9 @@
FIND_PATH(SDL2_INCLUDE_DIR NAMES SDL2/SDL.h) FIND_PATH(SDL2_INCLUDE_DIR NAMES SDL2/SDL.h)
FIND_LIBRARY(SDL2_LIBRARY NAMES SDL2) FIND_LIBRARY(SDL2_LIBRARY NAMES SDL2)
FIND_LIBRARY(SDL2MAIN_LIBRARY NAMES SDL2main)
SET(SDL2_LIBRARY ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY})
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)

2
examples/audio_sine.cc
View File

@ -29,7 +29,7 @@
using namespace SDL2pp; using namespace SDL2pp;
int main() try { int main(int, char*[]) try {
SDL sdl(SDL_INIT_AUDIO); SDL sdl(SDL_INIT_AUDIO);
const int samplerate = 48000; const int samplerate = 48000;

2
examples/audio_wav.cc
View File

@ -32,7 +32,7 @@
using namespace SDL2pp; using namespace SDL2pp;
int main() try { int main(int, char*[]) try {
SDL sdl(SDL_INIT_AUDIO); SDL sdl(SDL_INIT_AUDIO);
Wav wav(TESTDATA_DIR "/test.wav"); Wav wav(TESTDATA_DIR "/test.wav");

2
examples/fill.cc
View File

@ -75,7 +75,7 @@ static int Run() {
return 0; return 0;
} }
int main() { int main(int, char*[]) {
try { try {
return Run(); return Run();
} catch (std::exception& e) { } catch (std::exception& e) {

2
examples/image.cc
View File

@ -36,7 +36,7 @@ using namespace SDL2pp;
static const float pi = 3.14159265358979323846f; static const float pi = 3.14159265358979323846f;
int main() try { int main(int, char*[]) try {
SDL sdl(SDL_INIT_VIDEO); SDL sdl(SDL_INIT_VIDEO);
SDLImage image(IMG_INIT_PNG); // optional SDLImage image(IMG_INIT_PNG); // optional
Window window("libSDL2pp demo: loading", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE); Window window("libSDL2pp demo: loading", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE);

2
examples/lines.cc
View File

@ -29,7 +29,7 @@
using namespace SDL2pp; using namespace SDL2pp;
int main() try { int main(int, char*[]) try {
SDL sdl(SDL_INIT_VIDEO); SDL sdl(SDL_INIT_VIDEO);
Window window("libSDL2pp demo: sprites", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE); Window window("libSDL2pp demo: sprites", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE);
Renderer render(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE); Renderer render(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE);

2
examples/mixer.cc
View File

@ -31,7 +31,7 @@
using namespace SDL2pp; using namespace SDL2pp;
int main() try { int main(int, char*[]) try {
SDL sdl(SDL_INIT_AUDIO); SDL sdl(SDL_INIT_AUDIO);
SDLMixer mixerlib(MIX_INIT_OGG); SDLMixer mixerlib(MIX_INIT_OGG);
Mixer mixer(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096); Mixer mixer(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096);

2
examples/mixer_effects.cc
View File

@ -31,7 +31,7 @@
using namespace SDL2pp; using namespace SDL2pp;
int main() try { int main(int, char*[]) try {
SDL sdl(SDL_INIT_AUDIO); SDL sdl(SDL_INIT_AUDIO);
SDLMixer mixerlib(MIX_INIT_OGG); SDLMixer mixerlib(MIX_INIT_OGG);
Mixer mixer(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096); Mixer mixer(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096);

2
examples/mixer_music.cc
View File

@ -31,7 +31,7 @@
using namespace SDL2pp; using namespace SDL2pp;
int main() try { int main(int, char*[]) try {
SDL sdl(SDL_INIT_AUDIO); SDL sdl(SDL_INIT_AUDIO);
SDLMixer mixerlib(MIX_INIT_OGG); SDLMixer mixerlib(MIX_INIT_OGG);
Mixer mixer(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096); Mixer mixer(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096);

2
examples/mixer_music_sine.cc
View File

@ -28,7 +28,7 @@
using namespace SDL2pp; using namespace SDL2pp;
int main() try { int main(int, char*[]) try {
SDL sdl(SDL_INIT_AUDIO); SDL sdl(SDL_INIT_AUDIO);
Mixer mixer(MIX_DEFAULT_FREQUENCY, AUDIO_S16SYS, 1, 4096); Mixer mixer(MIX_DEFAULT_FREQUENCY, AUDIO_S16SYS, 1, 4096);

2
examples/rendertarget.cc
View File

@ -45,7 +45,7 @@ enum {
MY_RENDERTARGET_SIZE = 512, MY_RENDERTARGET_SIZE = 512,
}; };
int main() try { int main(int, char*[]) try {
SDL sdl(SDL_INIT_VIDEO); SDL sdl(SDL_INIT_VIDEO);
Window window("libSDL2pp demo: sprites", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, MY_SCREEN_WIDTH, MY_SCREEN_HEIGHT, SDL_WINDOW_RESIZABLE); Window window("libSDL2pp demo: sprites", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, MY_SCREEN_WIDTH, MY_SCREEN_HEIGHT, SDL_WINDOW_RESIZABLE);
Renderer render(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE); Renderer render(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE);

2
examples/sprites.cc
View File

@ -38,7 +38,7 @@ static const unsigned char pixels[4 * 4 * 4] = {
RGBA(0x80, 0x00, 0xff, 0xff), RGBA(0x00, 0x00, 0xff, 0xff), RGBA(0x00, 0x80, 0xff, 0xff), RGBA(0x00, 0xff, 0xff, 0xff), RGBA(0x80, 0x00, 0xff, 0xff), RGBA(0x00, 0x00, 0xff, 0xff), RGBA(0x00, 0x80, 0xff, 0xff), RGBA(0x00, 0xff, 0xff, 0xff),
}; };
int main() try { int main(int, char*[]) try {
SDL sdl(SDL_INIT_VIDEO); SDL sdl(SDL_INIT_VIDEO);
Window window("libSDL2pp demo: sprites", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE); Window window("libSDL2pp demo: sprites", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE);
Renderer render(window, -1, SDL_RENDERER_ACCELERATED); Renderer render(window, -1, SDL_RENDERER_ACCELERATED);

2
examples/ttf.cc
View File

@ -33,7 +33,7 @@
using namespace SDL2pp; using namespace SDL2pp;
int main() try { int main(int, char*[]) try {
SDL sdl(SDL_INIT_VIDEO); SDL sdl(SDL_INIT_VIDEO);
SDLTTF ttf; SDLTTF ttf;
Window window("libSDL2pp demo: font", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE); Window window("libSDL2pp demo: font", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE);

2
tests/header_containerrwops.cc
View File

@ -1,5 +1,5 @@
#include <SDL2pp/ContainerRWops.hh> #include <SDL2pp/ContainerRWops.hh>
int main() { int main(int, char*[]) {
return 0; return 0;
} }

2
tests/header_streamrwops.cc
View File

@ -1,5 +1,5 @@
#include <SDL2pp/StreamRWops.hh> #include <SDL2pp/StreamRWops.hh>
int main() { int main(int, char*[]) {
return 0; return 0;
} }

2
tests/header_test.cc.in
View File

@ -1,5 +1,5 @@
#include <@HEADER@> #include <@HEADER@>
int main() { int main(int, char*[]) {
return 0; return 0;
} }

2
tests/live_mixer.cc
View File

@ -7,7 +7,7 @@
using namespace SDL2pp; using namespace SDL2pp;
BEGIN_TEST() BEGIN_TEST(int, char*[])
SDL sdl(SDL_INIT_AUDIO); SDL sdl(SDL_INIT_AUDIO);
SDLMixer mixerlib; SDLMixer mixerlib;

2
tests/live_rendering.cc
View File

@ -49,7 +49,7 @@ public:
} }
}; };
BEGIN_TEST() BEGIN_TEST(int, char*[])
SDL sdl(SDL_INIT_VIDEO); SDL sdl(SDL_INIT_VIDEO);
Window window("libSDL2pp test", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 320, 240, 0); Window window("libSDL2pp test", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 320, 240, 0);
Renderer renderer(window, -1, SDL_RENDERER_ACCELERATED); Renderer renderer(window, -1, SDL_RENDERER_ACCELERATED);

2
tests/test_error.cc
View File

@ -6,7 +6,7 @@
using namespace SDL2pp; using namespace SDL2pp;
BEGIN_TEST() BEGIN_TEST(int, char*[])
SDL_SetError("foo"); SDL_SetError("foo");
try { try {

2
tests/test_optional.cc
View File

@ -6,7 +6,7 @@
using namespace SDL2pp; using namespace SDL2pp;
BEGIN_TEST() BEGIN_TEST(int, char*[])
// Engage/disengage // Engage/disengage
{ {
Optional<int> o; Optional<int> o;

2
tests/test_pointrect.cc
View File

@ -5,7 +5,7 @@
using namespace SDL2pp; using namespace SDL2pp;
BEGIN_TEST() BEGIN_TEST(int, char*[])
{ {
// Point basic ops // Point basic ops
Point p(1,2); Point p(1,2);

2
tests/test_pointrect_constexpr.cc
View File

@ -5,7 +5,7 @@
using namespace SDL2pp; using namespace SDL2pp;
BEGIN_TEST() BEGIN_TEST(int, char*[])
// note that this is merely a compilation test; EXPECT_s are mainly // note that this is merely a compilation test; EXPECT_s are mainly
// used to silence `unused variable' warnings // used to silence `unused variable' warnings
{ {

2
tests/test_rwops.cc
View File

@ -9,7 +9,7 @@
using namespace SDL2pp; using namespace SDL2pp;
BEGIN_TEST() BEGIN_TEST(int, char*[])
// First check our custom ContainerRWops, not touching // First check our custom ContainerRWops, not touching
// SDL-provided RWops services // SDL-provided RWops services
{ {