diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-10-18 18:39:48 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-10-18 18:39:48 +0000 |
| commit | 86441fda9c561dd264039edc68ddabbf7cb54ce2 (patch) | |
| tree | f9d15edf9587bc149a42399369bfcf3b9d5c5b27 /src/Makefile.am | |
| parent | d3ab0ef7be4c1f0098acc08748c308091e75dfff (diff) | |
| download | mana-86441fda9c561dd264039edc68ddabbf7cb54ce2.tar.gz mana-86441fda9c561dd264039edc68ddabbf7cb54ce2.tar.bz2 mana-86441fda9c561dd264039edc68ddabbf7cb54ce2.tar.xz mana-86441fda9c561dd264039edc68ddabbf7cb54ce2.zip | |
Merged removal of dependency on Guichan OpenGL from trunk to 0.0 branch,
including optimization of OpenGL memory usage on modern OpenGL drivers.
Patches by Guillaume Melquiond.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6d5ef196..1a121367 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -175,6 +175,10 @@ tmw_SOURCES = gui/widgets/resizegrip.cpp \ resources/animation.h \ resources/image.cpp \ resources/image.h \ + resources/imageloader.cpp \ + resources/imageloader.h \ + resources/imageset.h \ + resources/imageset.cpp \ resources/imagewriter.cpp \ resources/imagewriter.h \ resources/itemdb.cpp \ @@ -189,20 +193,14 @@ tmw_SOURCES = gui/widgets/resizegrip.cpp \ resources/monsterinfo.cpp \ resources/music.h \ resources/music.cpp \ - resources/openglsdlimageloader.h \ - resources/openglsdlimageloader.cpp \ resources/resource.cpp \ resources/resource.h \ resources/resourcemanager.cpp \ resources/resourcemanager.h \ - resources/sdlimageloader.h \ - resources/sdlimageloader.cpp \ resources/soundeffect.h \ resources/soundeffect.cpp \ resources/spritedef.h \ resources/spritedef.cpp \ - resources/imageset.h \ - resources/imageset.cpp \ resources/buddylist.h \ resources/buddylist.cpp \ utils/base64.cpp \ @@ -291,6 +289,6 @@ INCLUDES = \ # the library search path. tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0` -tmw_CXXFLAGS = -Wall $(OPENGL_CFLAGS) $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS) -tmw_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(OPENGL_LIBS) $(CURL_LIBS) +tmw_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS) +tmw_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(CURL_LIBS) tmw_TARGET = tmw |