diff options
| author | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-05-14 20:36:52 -0700 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-05-14 20:36:52 -0700 |
| commit | c908b3131b1fe6027ae9aa277916bc953a462b5a (patch) | |
| tree | 2c7f79f96878973d4d84d02b96955e58734b0ba2 | |
| parent | 400395d794bb64cd5aec18d0c30dea7afa09229a (diff) | |
| parent | b4456969cd02d75c599a5b86b225c0774697e85d (diff) | |
Merge branch 'upstream'
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/mods/theme/edit/d_info.txt | 2 | ||||
| -rw-r--r-- | lib/module.lua | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c93bebd6..91512a6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ IF(SDL_FOUND) # Add SDL flags/options ADD_DEFINITIONS(-DUSE_SDL) INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR}) - SET(LIBS ${LIBS} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDL_LIBRARY}) + SET(LIBS ${LIBS} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDL_LIBRARY} m) ELSE() # Let user know that (and why) we haven't enabled SDL. IF(SDLIMAGE_FOUND) diff --git a/lib/mods/theme/edit/d_info.txt b/lib/mods/theme/edit/d_info.txt index c54c9f8f..91cf3d20 100644 --- a/lib/mods/theme/edit/d_info.txt +++ b/lib/mods/theme/edit/d_info.txt @@ -296,7 +296,7 @@ F:RANDOM_TOWNS | F:FINAL_OBJECT_810 | FINAL_GUARDIAN_373 | CAVE | F:FILL_METHOD_0 F:FORCE_DOWN -F:WILD_21_49__51_19 +F:WILD_49_21__51_19 R:30:3 M:TROLL R:20:0 diff --git a/lib/module.lua b/lib/module.lua index ea8be613..e3214205 100644 --- a/lib/module.lua +++ b/lib/module.lua @@ -1,7 +1,7 @@ add_module { ["name"] = "ToME", - ["version"] = { 2, 3, 10 }, + ["version"] = { 2, 3, 11 }, ["author"] = { "DarkGod", "darkgod@t-o-m-e.net" }, ["desc"] = { "The Tales of Middle-earth, the standard and official game.", |