Fix main() signatures to be compatible with SDL_main

This commit is contained in:
Dmitry Marakasov 2015-12-11 22:58:50 +03:00
parent d575911ce7
commit 0aede126fc
22 changed files with 22 additions and 22 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -29,7 +29,7 @@
using namespace SDL2pp;
int main() try {
int main(int, char*[]) try {
SDL sdl(SDL_INIT_VIDEO);
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);

View File

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

View File

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

View File

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

View File

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

View File

@ -45,7 +45,7 @@ enum {
MY_RENDERTARGET_SIZE = 512,
};
int main() try {
int main(int, char*[]) try {
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);
Renderer render(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE);

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),
};
int main() try {
int main(int, char*[]) try {
SDL sdl(SDL_INIT_VIDEO);
Window window("libSDL2pp demo: sprites", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE);
Renderer render(window, -1, SDL_RENDERER_ACCELERATED);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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