Changeset 22133

Timestamp:

Jul 25, 2017, 1:03:21 AM (8 years ago)

Author:

dmik

Message:

Support building with os2tk45-headers RPM.

File:

• trunk/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -313 +313 @@
 endif
 
+#
+# We can't add Toolkit includes in _INCS (it will casuse them to be searched
+# before GCC headers and lead to conflicts), so use -idirafter.
+#
 ifneq ($(PATH_SDK_OS2TK4),)
-#
-# We can't add Toolkit includes in _INCS (it will casuse then to be searched
-# before GCC headers and lead to conflicts), so use -idirafter.
-#
 TEMPLATE_OdinCxx_CFLAGS    += -idirafter $(PATH_SDK_OS2TK4)/h
 TEMPLATE_OdinCxx_CXXFLAGS  += -idirafter $(PATH_SDK_OS2TK4)/h
-endif
+else
+# Assume os2tk45-headers RPM
+TEMPLATE_OdinCxx_CFLAGS    += -idirafter /@unixroot/usr/include/os2tk45
+TEMPLATE_OdinCxx_CXXFLAGS  += -idirafter /@unixroot/usr/include/os2tk45
+endif