ProjectSkyfire / SkyFire.406a

SkyFireEMU is a full featured F/OSS World of Warcraft: Cataclysm emulator written in C++. || Compatible with World of Warcraft client 4.0.6a (Build:13623) || Public DB is located on forum
http://www.projectskyfire.org
GNU General Public License v3.0
343 stars 218 forks source link

Acelite builds even if ACE present on the system (and bombs on Linux) #892

Closed ghost closed 11 years ago

ghost commented 11 years ago

When building on Linux, the dep/acelite is redundant (system ACE present).

It looks like the CMake file is OK in dep but the tools one still tries to enter dep/acelite and:

/usr/src/packages/BUILD/skyfire-emu-git20130503/dep/acelite/ace/os_include/os_inttypes.h:30:31: error: os_inttypes.h: No such file or directory
--- src/tools/mmaps_generator/CMakeLists.txt.orig       2013-05-03 13:58:29.965158977 +0100
+++ src/tools/mmaps_generator/CMakeLists.txt    2013-05-03 13:58:40.289210515 +0100
@@ -23,7 +23,6 @@
   ${CMAKE_SOURCE_DIR}/dep/libmpq
   ${CMAKE_SOURCE_DIR}/dep/zlib
   ${CMAKE_SOURCE_DIR}/dep/bzip2
-  ${CMAKE_SOURCE_DIR}/dep/acelite
   ${CMAKE_SOURCE_DIR}/dep/g3dlite/include
   ${CMAKE_SOURCE_DIR}/dep/recastlite/Recast
   ${CMAKE_SOURCE_DIR}/dep/recastlite/Detour

fixes this on Linux target, perhaps that needs to be put in conditionals to permit Windows target building.

With the above patch, on Linux, the build works fine.

Just a thought, why are 'tools' still building zlib/bzip2/libmpq if that's specified/configured? This may not be the best idea on Linux where libraries are provided externally.

Take care,

J

ghost commented 11 years ago

bzip2 and zlib can be also safely disabled on Linux (-devel packages), libmpq in presence of the system one as well (detected at configuration stage).

Build-tested.

SkyFire commented 11 years ago

Fixed. Thx.