Browse Source

Fixes DLL linkage issues on Windows due to library rename, using different defines when projects are generated by CMake

David Wimsey 11 years ago
parent
commit
b85abf147a
2 changed files with 8 additions and 8 deletions
  1. 4 4
      Include/Rocket/Controls/Lua/Header.h
  2. 4 4
      Include/Rocket/Core/Lua/Header.h

+ 4 - 4
Include/Rocket/Controls/Lua/Header.h

@@ -36,11 +36,11 @@
 
 #if !defined STATIC_LIB
 	#ifdef ROCKET_PLATFORM_WIN32
-		#if defined RocketcoreLua_EXPORTS 
+		#if defined RocketCoreLua_EXPORTS 
 			#define ROCKETLUA_API __declspec(dllexport)
-        #elif defined RocketcontrolsLua_EXPORTS
-            #define ROCKETLUA_API __declspec(dllexport)
-        #else
+		#elif defined RocketControlsLua_EXPORTS
+			#define ROCKETLUA_API __declspec(dllexport)
+        	#else
 			#define ROCKETLUA_API __declspec(dllimport)
 		#endif
 	#else

+ 4 - 4
Include/Rocket/Core/Lua/Header.h

@@ -36,11 +36,11 @@
 
 #if !defined STATIC_LIB
 	#ifdef ROCKET_PLATFORM_WIN32
-		#if defined RocketcoreLua_EXPORTS 
+		#if defined RocketCoreLua_EXPORTS 
 			#define ROCKETLUA_API __declspec(dllexport)
-        #elif defined RocketcontrolsLua_EXPORTS
-            #define ROCKETLUA_API __declspec(dllexport)
-        #else
+        	#elif defined RocketControlsLua_EXPORTS
+        	    #define ROCKETLUA_API __declspec(dllexport)
+        	#else
 			#define ROCKETLUA_API __declspec(dllimport)
 		#endif
 	#else