From: <sv...@ww...> - 2005-02-08 23:26:46
|
Author: delta Date: 2005-02-08 15:26:38 -0800 (Tue, 08 Feb 2005) New Revision: 1468 Added: trunk/CSP/CSPSim/Include/Export.h Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj Log: * Added Include/Export.h * Minor tweak to the vs project file to send _cCSP.lib to Bin/ Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1468 Modified: trunk/CSP/CSPSim/CHANGES.current =================================================================== --- trunk/CSP/CSPSim/CHANGES.current 2005-02-07 17:41:25 UTC (rev 1467) +++ trunk/CSP/CSPSim/CHANGES.current 2005-02-08 23:26:38 UTC (rev 1468) @@ -1,6 +1,11 @@ Version 0.4.0 (in progress) =========================== +2005-02-09: delta + * Added Include/Export.h + + * Minor tweak to the vs project file to send _cCSP.lib to Bin/ + 2005-02-05: onsight * Disable displaylist/stateset compiler visitor when creating ObjectModels, since it segfaults for models loaded using the Added: trunk/CSP/CSPSim/Include/Export.h =================================================================== --- trunk/CSP/CSPSim/Include/Export.h 2005-02-07 17:41:25 UTC (rev 1467) +++ trunk/CSP/CSPSim/Include/Export.h 2005-02-08 23:26:38 UTC (rev 1468) @@ -0,0 +1,49 @@ + // Combat Simulator Project + // Copyright (C) 2002-2005 The Combat Simulator Project + // http://csp.sourceforge.net + // + // This program is free software; you can redistribute it and/or + // modify it under the terms of the GNU General Public License + // as published by the Free Software Foundation; either version 2 + // of the License, or (at your option) any later version. + // + // This program is distributed in the hope that it will be useful, + // but WITHOUT ANY WARRANTY; without even the implied warranty of + // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + // GNU General Public License for more details. + // + // You should have received a copy of the GNU General Public License + // along with this program; if not, write to the Free Software + // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + // + + +/** + * @file Export.h + * @brief Macros needed to export/import symbols from shared libraries. + */ + +#ifndef __CSPSIM_EXPORT_H__ +#define __CSPSIM_EXPORT_H__ + +#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) + # ifdef SWIG + # undef __declspec + # define __declspec(x) + # endif // SWIG + # ifdef CSPSIMDLL_EXPORTS + # define CSPSIM_EXPORT __declspec(dllexport) + # else + # define CSPSIM_EXPORT __declspec(dllimport) + # endif // CSPSIMDLL_EXPORTS +#else + # define CSPSIM_EXPORT +#endif + +# if defined(_MSC_VER) && (_MSC_VER <= 1310) +#pragma warning (disable : 4786 4251 4290) +# endif + + +#endif // __CSPSIM_EXPORT_H__ + Modified: trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj =================================================================== --- trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2005-02-07 17:41:25 UTC (rev 1467) +++ trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2005-02-08 23:26:38 UTC (rev 1468) @@ -133,7 +133,7 @@ AssemblyDebug="0" GenerateMapFile="FALSE" MapExports="FALSE" - ImportLibrary=".\Release/_CSP.lib" + ImportLibrary="../../Bin/_cCSP.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" @@ -488,6 +488,9 @@ RelativePath="..\..\Include\Exception.h"> </File> <File + RelativePath="..\..\Include\Export.h"> + </File> + <File RelativePath="..\..\Include\FlightDynamics.h"> </File> <File |