Merge pull request DOCGroup#222 from jwillemsen/jwi-nddsscriptlocation

Simplify RTI Connext DDS base project and add define for RTI Connext DDS on QNX

Author: jwillemsen

config/ndds_ts_defaults.mpb

@@ -1,10 +1,10 @@
 // -*- MPC -*-
 project {
   Define_Custom(NDDSTypeSupport) {
-    command               = <%quote%>$(NDDSSCRIPTDIR)/rtiddsgen<%quote%>
+    command               = <%quote%>$(NDDSHOME)/bin/rtiddsgen<%quote%>
     commandflags          = $(PLATFORM_NDDS_FLAGS)
 
-    dependent             = $(NDDSSCRIPTDIR)/rtiddsgen<%bat%>
+    dependent             = $(NDDSHOME)/bin/rtiddsgen<%bat%>
 
     source_pre_extension  = , Support, Plugin
     source_outputext      = .cxx
@@ -18,16 +18,5 @@ project {
   verbatim(gnuace, macros, 1) {
     override no_hidden_visibility = 1
     override no_strict_aliasing = 1
-    ifdef NDDSHOME
-      ifndef NDDSSCRIPTDIR
-        # At the moment NDDSHOME has been set but not NDDSSCRIPTDIR we see if
-        # the scripts directory exists, if so we use that, if not we use bin
-        ifneq ($(wildcard $(NDDSHOME)/scripts),)
-          NDDSSCRIPTDIR = $(NDDSHOME)/scripts
-        else
-          NDDSSCRIPTDIR = $(NDDSHOME)/bin
-        endif
-      endif
-    endif
   }
 }

config/nddslib.mpb

@@ -27,5 +27,8 @@ project {
     else
     FLAGS_C_CC += -DRTI_UNIX
     endif
+    ifeq ($(ACE_PLATFORM_CONFIG),config-qnx.h)
+    FLAGS_C_CC += -DRTI_QNX
+    endif
   }
 }