diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-18 15:17:14 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-18 15:17:14 +0000 |
| commit | 732effa7a6a497d671b4d79102724b170cd36d63 (patch) | |
| tree | 2143c158ed3b91e835f8281d75a8d7d7a003ce94 /include | |
| parent | 1683c7376589961aeebecfb23b8a447311c6c6a9 (diff) | |
| download | ATCD-732effa7a6a497d671b4d79102724b170cd36d63.tar.gz | |
ChangeLogTag:Tue May 18 10:14:47 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/platform_linux_lxpthread.GNU | 19 | ||||
| -rw-r--r-- | include/makeinclude/platform_linux_lxpthreads.GNU | 19 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 35 |
3 files changed, 73 insertions, 0 deletions
diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU index 0c76c5d298c..606a4a04f16 100644 --- a/include/makeinclude/platform_linux_lxpthread.GNU +++ b/include/makeinclude/platform_linux_lxpthread.GNU @@ -10,6 +10,25 @@ debug = 1 optimize = 1 +xt_reactor = 0 + +PLATFORM_XT_CPPFLAGS= +PLATFORM_XT_LIBS=-lXt +PLATFORM_XT_LDFLAGS= + +fl_reactor = 0 + +PLATFORM_FL_CPPFLAGS= +PLATFORM_FL_LIBS=-lfltk +PLATFORM_FL_LDFLAGS= + +PLATFORM_X11_CPPFLAGS= +PLATFORM_X11_LIBS=-lX11 +PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib + +PLATFORM_GL_CPPFLAGS= +PLATFORM_GL_LIBS=-lMesaGL +PLATFORM_GL_LDFLAGS= ifeq ($(NO_IMPLICIT_TEMPLATES),) NO_IMPLICIT_TEMPLATES = -fno-implicit-templates diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU index 0c76c5d298c..606a4a04f16 100644 --- a/include/makeinclude/platform_linux_lxpthreads.GNU +++ b/include/makeinclude/platform_linux_lxpthreads.GNU @@ -10,6 +10,25 @@ debug = 1 optimize = 1 +xt_reactor = 0 + +PLATFORM_XT_CPPFLAGS= +PLATFORM_XT_LIBS=-lXt +PLATFORM_XT_LDFLAGS= + +fl_reactor = 0 + +PLATFORM_FL_CPPFLAGS= +PLATFORM_FL_LIBS=-lfltk +PLATFORM_FL_LDFLAGS= + +PLATFORM_X11_CPPFLAGS= +PLATFORM_X11_LIBS=-lX11 +PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib + +PLATFORM_GL_CPPFLAGS= +PLATFORM_GL_LIBS=-lMesaGL +PLATFORM_GL_LDFLAGS= ifeq ($(NO_IMPLICIT_TEMPLATES),) NO_IMPLICIT_TEMPLATES = -fno-implicit-templates diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index b4b5a69d244..8b45ad5f178 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -244,11 +244,46 @@ ifeq ($(xt_reactor),0) endif # xt_reactor ifneq ($(xt_reactor),) + override ace_with_x11=1 CPPFLAGS += -DACE_HAS_XT $(PLATFORM_XT_CPPFLAGS) LIBS += $(PLATFORM_XT_LIBS) LDFLAGS += $(PLATFORM_XT_LDFLAGS) endif # xt_reactor +ifeq ($(fl_reactor),0) + override fl_reactor = +endif # fl_reactor + +ifneq ($(fl_reactor),) + override ace_with_x11=1 + override ace_with_gl=1 + CPPFLAGS += -DACE_HAS_FL $(PLATFORM_FL_CPPFLAGS) + LIBS += $(PLATFORM_FL_LIBS) + LDFLAGS += $(PLATFORM_FL_LDFLAGS) +endif # fl_reactor + +ifeq ($(ace_with_gl),0) + override ace_with_gl = +endif # ace_with_gl + +ifneq ($(ace_with_gl),) + override ace_with_x11 = 1 + CPPFLAGS += $(PLATFORM_GL_CPPFLAGS) + LIBS += $(PLATFORM_GL_LIBS) + LDFLAGS += $(PLATFORM_GL_LDFLAGS) +endif # ace_with_gl + +ifeq ($(ace_with_x11),0) + override ace_with_x11 = +endif # ace_with_x11 + +ifneq ($(ace_with_x11),) + CPPFLAGS += $(PLATFORM_X11_CPPFLAGS) + LIBS += $(PLATFORM_X11_LIBS) + LDFLAGS += $(PLATFORM_X11_LDFLAGS) +endif # ace_with_x11 + + ifdef exceptions CPPFLAGS += -DACE_HAS_EXCEPTIONS ifeq ($(findstring g++,$(CXX)),g++) |