Changeset 277

Timestamp:

02/20/09 12:58:33 (16 years ago)

Author:

smidl

Message:

 

Files:

• bdm/CMakeLists.txt (modified) (1 diff)
• bdm/libconfig/libconfig.h (modified) (1 diff)
• doprava/matlab/k1.m (modified) (1 diff)

bdm/CMakeLists.txt

@@ -5 +5 @@
 SET(BdmEstim estim/libKF.cpp estim/libKF.h estim/libPF.cpp estim/libPF.h estim/arx.cpp estim/arx.h estim/mixef.cpp estim/mixef.h estim/merger.cpp)
 #SET(BdmUI userinfo.cpp userinfo.h)
-SET(BdmUI uibuilder.cpp uibuilder.h libconfig/libconfigcpp.c++ libconfig/grammar.c libconfig/libconfig.c libconfig/scanner.c)
+SET(BdmUI libconfig/libconfigcpp.cc libconfig/grammar.c libconfig/libconfig.c libconfig/scanner.c uibuilder.cpp uibuilder.h )
 
 #IF(${XERCES_FOUND})
-add_library (bdm itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim} ${BdmUI})
+add_library (bdm STATIC itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim} ${BdmUI})
+#set_target_properties(bdm PROPERTIES DEFINE_SYMBOL LIBCONFIG_STATIC)
 #ELSE(${XERCES_FOUND})
 #add_library (bdm itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim})

bdm/libconfig/libconfig.h

@@ -28 +28 @@
 #endif /* __cplusplus */
 
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-#if defined(LIBCONFIG_STATIC)
 #define LIBCONFIG_API
-#elif defined(LIBCONFIG_EXPORTS)
-#define LIBCONFIG_API __declspec(dllexport)
-#else /* ! LIBCONFIG_EXPORTS */
-#define LIBCONFIG_API __declspec(dllimport)
-#endif /* LIBCONFIG_STATIC */
-#else /* ! WIN32 */
-#define LIBCONFIG_API
-#endif /* WIN32 */
 
 #include <stdio.h>

doprava/matlab/k1.m

@@ -1 +1 @@
 itload('../release/k1.it');
+figure(1);
+hold off;
+plot(xt);
+hold on
+plot(odh_xt,'--');