nitrogenoxide

Since you had recast in the libmangos config I had assumed it was necessary, sorry. I'll test it out now EDIT: Tested 54c1fb7, builds fine, same system specs.

Fixes compiling Detour/Recast with gcc. Tested compile with gcc 4.4.3 under x86_64. Builds cleanly, didn't do a test run. Patch is against 17aa80a diff --git a/configure.ac b/configure.ac index 1a8cd08..fb6490c 100644 --- a/configure.ac +++ b/configure.ac @@ -283,6 +283,7 @@ AC_CONFIG_FILES([ dep/lib/Makefile dep/recastnavigation/Makefile dep/recastnavigation/Detour/Makefile + dep/recastnavigation/Recast/Makefile dep/src/Makefile dep/src/g3dlite/Makefile dep/src/zlib/Makefile diff --git a/dep/recastnavigation/Detour/Makefile.am b/dep/recastnavigation/Detour/Makefile.am index fe6b8dc..46fe3a3 100644 --- a/dep/recastnavigation/Detour/Makefile.am +++ b/dep/recastnavigation/Detour/Makefile.am @@ -3,7 +3,7 @@ ## Sub-directories to parse ## CPP flags for includes, defines, etc. -AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(srcdir) +AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(srcdir)/Include ## Build detour as convenience library. noinst_LIBRARIES = libdetour.a diff --git a/dep/recastnavigation/Makefile.am b/dep/recastnavigation/Makefile.am index de13c8b..58d22c9 100644 --- a/dep/recastnavigation/Makefile.am +++ b/dep/recastnavigation/Makefile.am @@ -1 +1 @@ -SUBDIRS = Detour \\ No newline at end of file +SUBDIRS = Detour Recast diff --git a/dep/recastnavigation/Recast/Makefile.am b/dep/recastnavigation/Recast/Makefile.am new file mode 100644 index 0000000..9937f0c --- /dev/null +++ b/dep/recastnavigation/Recast/Makefile.am @@ -0,0 +1,26 @@ +## Process this file with automake to produce Makefile.in + +## Sub-directories to parse + +## CPP flags for includes, defines, etc. +AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(srcdir)/Include + +## Build recast as convenience library. +noinst_LIBRARIES = librecast.a +librecast_a_SOURCES = \\ + Source/Recast.cpp \\ + Source/RecastAlloc.cpp \\ + Source/RecastArea.cpp \\ + Source/RecastContour.cpp \\ + Source/RecastFilter.cpp \\ + Source/RecastMesh.cpp \\ + Source/RecastMeshDetail.cpp \\ + Source/RecastRasterization.cpp \\ + Source/RecastRegion.cpp + +## Additional files to include when running 'make dist' +# Source and header files for recast +EXTRA_DIST = \\ + Include/Recast.h \\ + Include/recastAlloc.h \\ + Include/RecastAssert.h diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am index d8dff41..669f5d9 100644 --- a/src/mangosd/Makefile.am +++ b/src/mangosd/Makefile.am @@ -47,8 +47,8 @@ mangos_worldd_LDADD = \\ ../shared/Auth/libmangosauth.a \\ ../shared/libmangosshared.a \\ ../shared/vmap/libmangosvmaps.a \\ - ../shared/pathfinding/Detour/libmangosdetour.a \\ - ../shared/pathfinding/Recast/libmangosrecast.a \\ + ../../dep/recastnavigation/Detour/libdetour.a \\ + ../../dep/recastnavigation/Recast/librecast.a \\ ../framework/libmangosframework.a \\ ../../dep/src/g3dlite/libg3dlite.a \\ ../../dep/src/gsoap/libgsoap.a diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am index 83d2e4e..6c711c6 100644 --- a/src/shared/Makefile.am +++ b/src/shared/Makefile.am @@ -17,7 +17,7 @@ ## Process this file with automake to produce Makefile.in ## Sub-directories to parse -SUBDIRS = Auth Config Database vmap pathfinding +SUBDIRS = Auth Config Database vmap ## CPP flags for includes, defines, etc. AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../../dep/include/g3dlite -DSYSCONFDIR=\\"$(sysconfdir)/\\"