diff options
Diffstat (limited to 'include/makeinclude/wrapper_macros.GNU')
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index a36f854f89a..be6035f5f93 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -39,8 +39,6 @@ # static_libs_only Only build static libraries. # threads Build with thread support. # xt_reactor Build the XtReactor. -# fl_reactor Build the FlReactor. -# tk_reactor Build the TkReactor. # # Usually, users do not need to be concerned with make targets. # Just enter "make" on the command line to build. A few notable @@ -246,57 +244,11 @@ 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 ($(tk_reactor),0) - override tk_reactor = -endif # tk_reactor - -ifneq ($(tk_reactor),) - override ace_with_tk=1 - CPPFLAGS += -DACE_HAS_TK $(PLATFORM_TK_CPPFLAGS) - LIBS += $(PLATFORM_TK_LIBS) - LDFLAGS += $(PLATFORM_TK_LDFLAGS) -endif # tk_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++) @@ -375,9 +327,7 @@ ifdef shared_libs BUILD = $(VSHLIB) $(SHLIBA) $(VBIN) LIB = OBJEXT = so - ifndef VXWORKS - VDIR = .shobj/ - endif # ! VXWORKS + VDIR = .shobj/ ifeq ($(BIN),) #### No executables are being built, so don't create .obj/. OBJDIRS = .shobj |