[Csp-commits] svn:csp r1781 - in trunk/CSP/csp: csplib/util cspsim

[<sv...@ww...>]

Author: mkrose
Date: 2005-12-18 22:13:28 -0800 (Sun, 18 Dec 2005)
New Revision: 1781

Modified:
   trunk/CSP/csp/csplib/util/LogConstants.h
   trunk/CSP/csp/cspsim/Config.h
   trunk/CSP/csp/cspsim/TerrainObject.h
Log:
A few more windows tweaks.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1781

Modified: trunk/CSP/csp/csplib/util/LogConstants.h
===================================================================
--- trunk/CSP/csp/csplib/util/LogConstants.h	2005-12-19 05:56:52 UTC (rev 1780)
+++ trunk/CSP/csp/csplib/util/LogConstants.h	2005-12-19 06:13:28 UTC (rev 1781)
@@ -27,6 +27,26 @@
 
 #include <csp/csplib/util/Namespace.h>
 
+// the following symbols are used in the logging macros, so
+// previous macro declarations must be deleted.  note that we
+// do *not* redefine these macros, the symbols are ## joined
+// with cLogPriority_ to construct the priority constants below.
+#ifdef DEBUG
+#undef DEBUG
+#endif
+#ifdef INFO
+#undef INFO
+#endif
+#ifdef WARNING
+#undef WARNING
+#endif
+#ifdef ERROR
+#undef ERROR
+#endif
+#ifdef FATAL
+#undef FATAL
+#endif
+
 CSP_NAMESPACE
 
 /** Log message priorities

Modified: trunk/CSP/csp/cspsim/Config.h
===================================================================
--- trunk/CSP/csp/cspsim/Config.h	2005-12-19 05:56:52 UTC (rev 1780)
+++ trunk/CSP/csp/cspsim/Config.h	2005-12-19 06:13:28 UTC (rev 1781)
@@ -25,46 +25,48 @@
 #ifndef __CSPSIM_CONFIG_H__
 #define __CSPSIM_CONFIG_H__
 
+#include <csp/cspsim/Export.h>
 #include <csp/csplib/util/Namespace.h>
 #include <csp/csplib/util/SimpleConfig.h>
 #include <string>
 
 CSP_NAMESPACE
 
+// TODO move to CSPSim?
 /**
  * Global configuration file
  */
-extern SimpleConfig g_Config;
+extern CSPSIM_EXPORT SimpleConfig g_Config;
 
 /**
  * Open the global configuration file.
  */
-extern bool openConfig(std::string path, bool report_error); //=true);
+extern CSPSIM_EXPORT bool openConfig(std::string path, bool report_error); //=true);
 
 /**
  * Get the main cache path.
  */
-extern std::string getCachePath();
+extern CSPSIM_EXPORT std::string getCachePath();
 
 /**
  * Get the main configuration path.
  */
-extern std::string getConfigPath();
+extern CSPSIM_EXPORT std::string getConfigPath();
 
 /**
  * Get the specific configuration path.
  */
-extern std::string getConfigPath(std::string const &);
+extern CSPSIM_EXPORT std::string getConfigPath(std::string const &);
 
 /**
  * Get the main data path.
  */
-extern std::string getDataPath();
+extern CSPSIM_EXPORT std::string getDataPath();
 
 /**
  * Get the specific data path.
  */
-extern std::string getDataPath(std::string const &);
+extern CSPSIM_EXPORT std::string getDataPath(std::string const &);
 
 CSP_NAMESPACE_END
 

Modified: trunk/CSP/csp/cspsim/TerrainObject.h
===================================================================
--- trunk/CSP/csp/cspsim/TerrainObject.h	2005-12-19 05:56:52 UTC (rev 1780)
+++ trunk/CSP/csp/cspsim/TerrainObject.h	2005-12-19 06:13:28 UTC (rev 1781)
@@ -29,7 +29,7 @@
 #ifndef __CSPSIM_TERRAINOBJECT_H__
 #define __CSPSIM_TERRAINOBJECT_H__
 
-
+#include <csp/cspsim/Export.h>
 #include <csp/csplib/util/Ref.h>
 #include <csp/csplib/data/Object.h>
 #include <csp/csplib/data/GeoPos.h>
@@ -48,13 +48,9 @@
 
 
 /**
- * class TerrainObject
- *
- * @author unknown
+ * Abstract base class for all terrain modules.
  */
-
-class TerrainObject: public Object
-{
+class CSPSIM_EXPORT TerrainObject: public Object {
 public:
 	CSP_DECLARE_ABSTRACT_OBJECT(TerrainObject)