Context Navigation

UtilPrereqs.h

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

Property svn:mergeinfo changed

/code/branches/buildsystem (added)	merged: 1875,1882-1886,1975-1982,1991,1999,2054,2061,2135,2137-2139,2197-2199,2204,2214-2220,2223-2224,2229,2233-2244,2248-2249,2252-2253,2260,2275,2278-2279,2318,2322,2325-2326,2335-2336,2338-2339,2359-2360,2384,2392,2399
/code/branches/buildsystem2 (added)	merged: 2507,2509-2512,2516-2526,2534,2546-2547,2566-2570,2572-2574,2576-2577,2579-2652,2654,2656-2658

Property svn:mergeinfo changed

/code/branches/buildsystem/src/util (added)	merged: 2197-2198,2244,2278,2384
/code/branches/buildsystem2/src/util (added)	merged: 2509-2510,2512,2525,2534,2579,2588,2596,2619,2621,2624,2626-2627,2634,2638-2640

-                      r2171
+                      r2664
 #define _UtilPrereqs_H__
 #include "util/OrxonoxPlatform.h"
+#include "OrxonoxConfig.h"
 //-----------------------------------------------------------------------
 // Shared library settings
 //-----------------------------------------------------------------------
 #if (ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32) && !defined( UTIL_STATIC_BUILD )
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( UTIL_STATIC_BUILD )
 #  ifdef UTIL_SHARED_BUILD
 #    define _UtilExport __declspec(dllexport)

Note: See TracChangeset for help on using the changeset viewer.