Revision: 9113 http://sourceforge.net/p/playerstage/svn/9113 Author: jpgr87 Date: 2013-01-04 21:37:23 +0000 (Fri, 04 Jan 2013) Log Message: ----------- libplayerinterface: Fix dllimport/dllexport definitions
The dllimport/dllexport definitions were being triggered by the preprocessor definition libplayerxdr_EXPORTS, which CMake used to define when libplayerxdr was a separate library. Since they're part of the libplayerinterface library now, libplayerinterface_EXPORTS is the proper definition to use. Modified Paths: -------------- code/player/trunk/libplayerinterface/functiontable.h code/player/trunk/libplayerinterface/playerxdrgen.py Modified: code/player/trunk/libplayerinterface/functiontable.h =================================================================== --- code/player/trunk/libplayerinterface/functiontable.h 2012-12-17 02:51:14 UTC (rev 9112) +++ code/player/trunk/libplayerinterface/functiontable.h 2013-01-04 21:37:23 UTC (rev 9113) @@ -50,7 +50,7 @@ #if defined (WIN32) #if defined (PLAYER_STATIC) #define PLAYERXDR_EXPORT - #elif defined (playerxdr_EXPORTS) + #elif defined (playerinterface_EXPORTS) #define PLAYERXDR_EXPORT __declspec (dllexport) #else #define PLAYERXDR_EXPORT __declspec (dllimport) Modified: code/player/trunk/libplayerinterface/playerxdrgen.py =================================================================== --- code/player/trunk/libplayerinterface/playerxdrgen.py 2012-12-17 02:51:14 UTC (rev 9112) +++ code/player/trunk/libplayerinterface/playerxdrgen.py 2013-01-04 21:37:23 UTC (rev 9113) @@ -501,7 +501,7 @@ #if defined (WIN32) #if defined (PLAYER_STATIC) #define PLAYERXDR_EXPORT - #elif defined (playerxdr_EXPORTS) + #elif defined (playerinterface_EXPORTS) #define PLAYERXDR_EXPORT __declspec (dllexport) #else #define PLAYERXDR_EXPORT __declspec (dllimport) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and much more. Get web development skills now with LearnDevNow - 350+ hours of step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122812 _______________________________________________ Playerstage-commit mailing list Playerstage-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/playerstage-commit