From 327da1dfc335572857fe16e0a231c83842aab871 Mon Sep 17 00:00:00 2001 From: Juraj Michalek Date: Sat, 2 May 2015 12:37:16 +0200 Subject: [PATCH] ignore VS files --- .gitignore | 2 ++ sdl/02-sdl2-video/build.gradle | 2 +- sdl/02-sdl2-video/packages.config | 5 +++++ sdl/02-sdl2-video/src/main/c/sdl2-video.c | 6 ++++-- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 sdl/02-sdl2-video/packages.config diff --git a/.gitignore b/.gitignore index 783f9d5..e3ef936 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .DS_Store .gradle build/ +*.sou +*.sdf \ No newline at end of file diff --git a/sdl/02-sdl2-video/build.gradle b/sdl/02-sdl2-video/build.gradle index 522dd73..a349ebf 100644 --- a/sdl/02-sdl2-video/build.gradle +++ b/sdl/02-sdl2-video/build.gradle @@ -8,7 +8,7 @@ sources { include "**/*.c" } exportedHeaders { - srcDir "../build/include" + srcDir "../build/include/SDL2" } } } diff --git a/sdl/02-sdl2-video/packages.config b/sdl/02-sdl2-video/packages.config new file mode 100644 index 0000000..20cffe7 --- /dev/null +++ b/sdl/02-sdl2-video/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/sdl/02-sdl2-video/src/main/c/sdl2-video.c b/sdl/02-sdl2-video/src/main/c/sdl2-video.c index 5f92a2b..ab7063f 100644 --- a/sdl/02-sdl2-video/src/main/c/sdl2-video.c +++ b/sdl/02-sdl2-video/src/main/c/sdl2-video.c @@ -2,7 +2,9 @@ // #include -#include "SDL2/SDL.h" +#include "SDL.h" +// Linux build will probably need little bit different include +//#include "SDL2/SDL.h" int main(int argc, char* argv[]) { SDL_Window *win = NULL; @@ -27,7 +29,7 @@ int main(int argc, char* argv[]) { return 3; } - bmp = SDL_LoadBMP("./smajlik.bmp"); + bmp = SDL_LoadBMP("./src/main/resources/smajlik.bmp"); if (bmp == NULL){ printf("%s\n", SDL_GetError()); return 4;