diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-01 22:20:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-01 22:20:33 +0300 |
| commit | dd380bf0c3ed3150e57bf4b14d51cae1c206565e (patch) | |
| tree | cca80a85c6964e9d5d94d78f368f5c5fed05b7cb | |
| parent | 2494c745761e17d5ad92dbbed4de8d4124db39fd (diff) | |
| download | manaplus-dd380bf0c3ed3150e57bf4b14d51cae1c206565e.tar.gz manaplus-dd380bf0c3ed3150e57bf4b14d51cae1c206565e.tar.bz2 manaplus-dd380bf0c3ed3150e57bf4b14d51cae1c206565e.tar.xz manaplus-dd380bf0c3ed3150e57bf4b14d51cae1c206565e.zip | |
fix compilation with SDL2.
| -rw-r--r-- | src/Makefile.am | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0ad010bd0..a05e4bc41 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,7 +46,8 @@ dyecmd_SOURCES = guichan/actionevent.cpp \ guichan/include/guichan/rectangle.hpp \ guichan/include/guichan/widget.hpp else -dyecmd_SOURCES = +dyecmd_CXXFLAGS = +dyecmd_SOURCES = endif dyecmd_SOURCES += dyetool/dyemain.cpp \ @@ -70,6 +71,10 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \ render/graphics.h \ render/renderers.cpp \ render/renderers.h \ + render/sdl2softwaregraphics.cpp \ + render/sdl2softwaregraphics.h \ + render/sdl2graphics.cpp \ + render/sdl2graphics.h \ render/sdlgraphics.cpp \ render/sdlgraphics.h \ resources/action.cpp \ @@ -92,6 +97,10 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \ resources/resource.h \ resources/resourcemanager.cpp \ resources/resourcemanager.h \ + resources/sdl2softwareimagehelper.cpp \ + resources/sdl2softwareimagehelper.h \ + resources/sdl2imagehelper.cpp \ + resources/sdl2imagehelper.h \ resources/sdlimagehelper.cpp \ resources/sdlimagehelper.h \ resources/sdlmusic.cpp \ @@ -134,6 +143,12 @@ manaplus_CXXFLAGS += -DENABLE_CHECKS endif if USE_SDL2 +dyecmd_CXXFLAGS += -I$(srcdir)/sdl2gfx -DUSE_SDL2 +dyecmd_SOURCES += sdl2gfx/SDL_framerate.c \ + sdl2gfx/SDL_framerate.h \ + sdl2gfx/SDL_rotozoom.c \ + sdl2gfx/SDL_rotozoom.h + manaplus_CXXFLAGS += -I$(srcdir)/sdl2gfx -DUSE_SDL2 manaplus_SOURCES += sdl2gfx/SDL_framerate.c \ sdl2gfx/SDL_framerate.h \ |