From 95dec25370e2ace6113743353320d70e5858fc21 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 29 Apr 2013 15:44:59 +0200 Subject: [PATCH] Fix link error caused by OCC support with Visual C++ --- qmake.build/foug_datax.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qmake.build/foug_datax.pro b/qmake.build/foug_datax.pro index 903d3a0..4a17e1e 100644 --- a/qmake.build/foug_datax.pro +++ b/qmake.build/foug_datax.pro @@ -99,6 +99,9 @@ contains(DATAX, occ_support) { INCLUDEPATH += $$CASCADE_ROOT/inc + win32-*:DEFINES *= WNT + linux-*:DEFINES *= LIN LININTEL OCC_CONVERT_SIGNALS + *-64:DEFINES *= _OCC64 !win32:DEFINES *= HAVE_CONFIG_H \ HAVE_FSTREAM \ HAVE_IOSTREAM \ @@ -119,7 +122,7 @@ contains(DATAX, occ_support) { win32-msvc2010:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc10/lib } - LIBS += -L$$CASCADE_LIBPATH -lTKSTL -lTKernel + LIBS += -L$$CASCADE_LIBPATH -lTKSTL -lTKernel -lTKMath QMAKE_RPATHDIR += $$CASCADE_LIBPATH occ_support_inc.path = $$PREFIX_DIR/include/datax/c/support