diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-06-03 18:42:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-06-03 18:42:52 +0300 |
| commit | e4e65d5c2c1f7d5354f2bacaed59fbedd678578f (patch) | |
| tree | 1075ec6f9d00bcb8c8cfaac029568529b157d38f /src | |
| parent | fb2b5feb7a2cfff38168316135e05d7c338c34c8 (diff) | |
| download | plus-e4e65d5c2c1f7d5354f2bacaed59fbedd678578f.tar.gz plus-e4e65d5c2c1f7d5354f2bacaed59fbedd678578f.tar.bz2 plus-e4e65d5c2c1f7d5354f2bacaed59fbedd678578f.tar.xz plus-e4e65d5c2c1f7d5354f2bacaed59fbedd678578f.zip | |
Remove SDL_gfxBlitFunc.h from automake, and leave it only in cmake
to fix windows builds.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/SDL_gfx/SDL_gfxBlitFunc.h (renamed from src/SDL_gfxBlitFunc.h) | 0 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ac4260391..df0a9ea0f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -69,6 +69,7 @@ ENDIF (USE_X11) INCLUDE_DIRECTORIES( "guichan/include" + "SDL_gfx" ${CMAKE_CURRENT_SOURCE_DIR} ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} diff --git a/src/Makefile.am b/src/Makefile.am index c13f645bd..9863a0f69 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -564,7 +564,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ sprite.h \ statuseffect.cpp \ statuseffect.h \ - SDL_gfxBlitFunc.h \ text.cpp \ text.h \ textmanager.cpp \ @@ -720,7 +719,8 @@ EXTRA_DIST = CMakeLists.txt \ enet/README \ mana.rc \ SDLMain.h \ - SDLMain.m + SDLMain.m \ + SDL_gfx/SDL_gfxBlitFunc.h # set the include path found by configure INCLUDES = $(all_includes) diff --git a/src/SDL_gfxBlitFunc.h b/src/SDL_gfx/SDL_gfxBlitFunc.h index f233aa617..f233aa617 100644 --- a/src/SDL_gfxBlitFunc.h +++ b/src/SDL_gfx/SDL_gfxBlitFunc.h |