Changeset 8 for trunk/src

Show
Ignore:
Timestamp:
11/19/08 13:22:31 (17 years ago)
Author:
yumileroy
Message:

[svn] * Auto detect if ACE is already installed and use it.

Original author: derex_tri
Date: 2008-10-04 10:45:45-05:00

Location:
trunk/src
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/game/Makefile.am

    r6 r8  
    3131$(POSTGRE_INCLUDES) \ 
    3232-I$(top_srcdir)/dep/include \ 
    33 -I$(top_srcdir)/dep/ACE_wrappers \ 
    34 -I$(top_builddir)/dep/ACE_wrappers \ 
    3533-I$(top_srcdir)/src/framework \ 
    3634-I$(top_srcdir)/src/shared \ 

  • trunk/src/shared/Makefile.am

    r6 r8  
    3131$(POSTGRE_INCLUDES) \ 
    3232-I$(top_srcdir)/dep/include \ 
    33 -I$(top_srcdir)/dep/ACE_wrappers \ 
    34 -I$(top_builddir)/dep/ACE_wrappers \ 
    3533-I$(top_srcdir)/src/framework 
    3634 

  • trunk/src/trinitycore/Makefile.am

    r6 r8  
    2525$(POSTGRE_INCLUDES) \ 
    2626-I$(top_srcdir)/dep/include \ 
    27 -I$(top_srcdir)/dep/ACE_wrappers \ 
    28 -I$(top_builddir)/dep/ACE_wrappers \ 
    2927-I$(top_srcdir)/src/shared \ 
    3028-I$(top_srcdir)/src/framework \ 
    … …  
    5250$(top_builddir)/dep/src/sockets/libmangossockets.a \ 
    5351$(top_builddir)/dep/src/zthread/libZThread.la \ 
    54 $(top_builddir)/dep/ACE_wrappers/ace/libACE.la \ 
    5552$(top_builddir)/dep/src/g3dlite/libg3dlite.a 
    5653 
    … …  
    6259 
    6360## Linker flags 
    64 trinity_core_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) -export-dynamic 
     61trinity_core_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(ACE_LIBS) -export-dynamic 
    6562 
    6663## Additional files to install 

  • trunk/src/trinityrealm/Makefile.am

    r6 r8  
    2525$(POSTGRE_INCLUDES) \ 
    2626-I$(top_srcdir)/dep/include \ 
    27 -I$(top_srcdir)/dep/ACE_wrappers \ 
    28 -I$(top_builddir)/dep/ACE_wrappers \ 
    2927-I$(top_srcdir)/src/framework \ 
    3028-I$(top_srcdir)/src/shared \ 
    … …  
    4543$(top_builddir)/src/framework/libmangosframework.a \ 
    4644$(top_builddir)/dep/src/sockets/libmangossockets.a \ 
    47 $(top_builddir)/dep/ACE_wrappers/ace/libACE.la \ 
    4845$(top_builddir)/dep/src/zthread/libZThread.la 
    4946 
    5047## Linker flags 
    51 trinity_realm_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) 
     48trinity_realm_LDFLAGS = $(MYSQL_LIBS) $(POSTGRE_LIBS) $(ZLIB) $(COMPATLIB) $(SSLLIB) $(ACE_LIBS) 
    5249 
    5350## Additional files to install