diff options
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/platform_irix6.2_sgic++.GNU | 6 | ||||
| -rw-r--r-- | include/makeinclude/platform_linux_lxpthread.GNU | 6 | ||||
| -rw-r--r-- | include/makeinclude/platform_linux_lxpthreads.GNU | 6 | ||||
| -rw-r--r-- | include/makeinclude/rules.local.GNU | 10 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 3 |
5 files changed, 27 insertions, 4 deletions
diff --git a/include/makeinclude/platform_irix6.2_sgic++.GNU b/include/makeinclude/platform_irix6.2_sgic++.GNU index 4d774f3c3e6..ba42f9a5975 100644 --- a/include/makeinclude/platform_irix6.2_sgic++.GNU +++ b/include/makeinclude/platform_irix6.2_sgic++.GNU @@ -13,7 +13,11 @@ CC = cc CXX = CC DLD = $(CXX) LD = $(CXX) -CPPFLAGS += -ptused -prelink +pp -D_SGI_MP_SOURCE -woff 3203,3209,3161,3262,3665 +CPPFLAGS += -ptused -prelink -D_SGI_MP_SOURCE +# For the new 32 bit C++ compiler (-n32) +#CPPFLAGS += -n32 -woff 1174,1209,1375,1506,1110,1552,1021,1171 +# For the old C++ compiler (-32) +CPPFLAGS += +pp -woff 3203,3209,3161,3262,3665 LDFLAGS += -rpath "$(WRAPPER_ROOT)/ace" -Wl,-woff,85 LIBS += -lpthread PIC = -KPIC diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU index 67e517633ce..1e160271131 100644 --- a/include/makeinclude/platform_linux_lxpthread.GNU +++ b/include/makeinclude/platform_linux_lxpthread.GNU @@ -11,7 +11,7 @@ CC = gcc -w CXX = gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS DLD = $(CXX) LD = $(CXX) -LIBS += -lpthread -lstdc++ +LIBS += -ldl -lpthread -lstdc++ PIC = -fPIC AR = ar ARFLAGS = ruv @@ -19,6 +19,10 @@ RANLIB = ranlib SOFLAGS = $(CPPFLAGS) -shared SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< +# Added line below to support "Executable Shared Object" files (as +# needed by the service configurator). +# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com> +ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $< PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \ $(COMPILE.cc) -o gcctemp.o gcctemp.c && \ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \ diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU index 67e517633ce..1e160271131 100644 --- a/include/makeinclude/platform_linux_lxpthreads.GNU +++ b/include/makeinclude/platform_linux_lxpthreads.GNU @@ -11,7 +11,7 @@ CC = gcc -w CXX = gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS DLD = $(CXX) LD = $(CXX) -LIBS += -lpthread -lstdc++ +LIBS += -ldl -lpthread -lstdc++ PIC = -fPIC AR = ar ARFLAGS = ruv @@ -19,6 +19,10 @@ RANLIB = ranlib SOFLAGS = $(CPPFLAGS) -shared SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< +# Added line below to support "Executable Shared Object" files (as +# needed by the service configurator). +# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com> +ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $< PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \ $(COMPILE.cc) -o gcctemp.o gcctemp.c && \ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \ diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU index 3a66ef68b1c..2411cf9efd0 100644 --- a/include/makeinclude/rules.local.GNU +++ b/include/makeinclude/rules.local.GNU @@ -53,9 +53,17 @@ $(VDIR)%.o: %.cpp # built via the same rule. SOLINK is required for the repository under # gcc. ifndef SOLINK -$(VSHDIR)%.so: %.cpp +# I added the "Executable Shared Object (ESO)" define to separate between +# normal shared object files and executable shared object files (the kind +# that the service configurator needs to be able to function). +# 970104 Marius Kjeldahl <mariusk@sn.no, marius@funcom.com> +ifndef ESO +$(VSHDIR)%.so: %.cpp $(SOBUILD) else +$(VSHDIR)%.so: %.cpp + $(ESOBUILD) +endif $(VSHDIR)%.o: %.cpp $(COMPILE.cc) $(PIC) -o $@ $< $(VSHDIR)%.o: %.cc diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 767fefa6d0b..21e4b6c4145 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -112,6 +112,9 @@ endif # debug COMPILE.c =$(CC) $(CFLAGS) $(CPPFLAGS) -c COMPILE.cc =$(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) -c +# 960905 Marius Kjeldahl <marius@funcom.com> +# Added the line below to be used for compiling executable shared objects +COMPILEESO.cc =$(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) LINK.c =$(LD) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LDLIBS) $(LIBS) LINK.cc =$(LD) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) SOLINK.cc =$(LINK_COMMAND) $(DLD) $(SOFLAGS) |