Rename STATIC_LIB macro to ROCKET_STATIC_LIB.

andersm · Dec 17, 2014 · a0dd198 · a0dd198
1 parent b6f6631
commit a0dd198
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 9 deletions.
diff --git a/Build/CMakeLists.txt b/Build/CMakeLists.txt
@@ -133,7 +133,7 @@ if(BUILD_FRAMEWORK)
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
-    add_definitions(-DSTATIC_LIB)
+	add_definitions(-DROCKET_STATIC_LIB)
 endif()
 
 #on windows, check for VC10 and fix the multiple compile target issue.

diff --git a/Include/Rocket/Controls/Header.h b/Include/Rocket/Controls/Header.h
@@ -30,7 +30,12 @@
 
 #include "../Core/Platform.h"
 
-#if !defined STATIC_LIB
+#ifdef STATIC_LIB
+	#define ROCKET_STATIC_LIB
+	#warning "DEPRECATED: STATIC_LIB macro has been deprecated in favor of ROCKET_STATIC_LIB and support will be removed in a future release"
+#endif
+
+#if !defined ROCKET_STATIC_LIB
 	#ifdef ROCKET_PLATFORM_WIN32
 		#ifdef RocketControls_EXPORTS
 			#define ROCKETCONTROLS_API __declspec(dllexport)

diff --git a/Include/Rocket/Controls/Lua/Header.h b/Include/Rocket/Controls/Lua/Header.h
@@ -34,7 +34,12 @@
 #undef ROCKETLUA_API
 #endif
 
-#if !defined STATIC_LIB
+#ifdef STATIC_LIB
+	#define ROCKET_STATIC_LIB
+	#warning "DEPRECATED: STATIC_LIB macro has been deprecated in favor of ROCKET_STATIC_LIB and support will be removed in a future release"
+#endif
+
+#if !defined ROCKET_STATIC_LIB
 	#ifdef ROCKET_PLATFORM_WIN32
 		#if defined RocketCoreLua_EXPORTS 
 			#define ROCKETLUA_API __declspec(dllexport)

diff --git a/Include/Rocket/Core/Header.h b/Include/Rocket/Core/Header.h
@@ -33,7 +33,12 @@
 // Note: Changing a ROCKETCORE_API_INLINE method
 // breaks ABI compatibility!!
 
-#if !defined STATIC_LIB
+#ifdef STATIC_LIB
+	#define ROCKET_STATIC_LIB
+	#warning "DEPRECATED: STATIC_LIB macro has been deprecated in favor of ROCKET_STATIC_LIB and support will be removed in a future release"
+#endif
+
+#if !defined ROCKET_STATIC_LIB
 	#if defined ROCKET_PLATFORM_WIN32
 		#if defined RocketCore_EXPORTS
 			#define ROCKETCORE_API __declspec(dllexport)

diff --git a/Include/Rocket/Core/Lua/Header.h b/Include/Rocket/Core/Lua/Header.h
@@ -34,7 +34,12 @@
 #undef ROCKETLUA_API
 #endif
 
-#if !defined STATIC_LIB
+#ifdef STATIC_LIB
+	#define ROCKET_STATIC_LIB
+	#warning "DEPRECATED: STATIC_LIB macro has been deprecated in favor of ROCKET_STATIC_LIB and support will be removed in a future release"
+#endif
+
+#if !defined ROCKET_STATIC_LIB
 	#ifdef ROCKET_PLATFORM_WIN32
 		#if defined RocketCoreLua_EXPORTS 
 			#define ROCKETLUA_API __declspec(dllexport)

diff --git a/Include/Rocket/Core/Python/Header.h b/Include/Rocket/Core/Python/Header.h
@@ -30,7 +30,12 @@
 
 #include "../Platform.h"
 
-#if !defined STATIC_LIB
+#ifdef STATIC_LIB
+	#define ROCKET_STATIC_LIB
+	#warning "DEPRECATED: STATIC_LIB macro has been deprecated in favor of ROCKET_STATIC_LIB and support will be removed in a future release"
+#endif
+
+#if !defined ROCKET_STATIC_LIB
 #if defined ROCKET_PLATFORM_WIN32
 	#if defined RocketCorePython_EXPORTS
 		#define ROCKETCOREPYTHON_API __declspec(dllexport)

diff --git a/Include/Rocket/Debugger/Header.h b/Include/Rocket/Debugger/Header.h
@@ -30,7 +30,12 @@
 
 #include "../Core/Platform.h"
 
-#if !defined STATIC_LIB
+#ifdef STATIC_LIB
+	#define ROCKET_STATIC_LIB
+	#warning "DEPRECATED: STATIC_LIB macro has been deprecated in favor of ROCKET_STATIC_LIB and support will be removed in a future release"
+#endif
+
+#if !defined ROCKET_STATIC_LIB
 	#ifdef ROCKET_PLATFORM_WIN32
 		#ifdef RocketDebugger_EXPORTS
 			#define ROCKETDEBUGGER_API __declspec(dllexport)

diff --git a/how_to_build_for_mingw.txt b/how_to_build_for_mingw.txt
@@ -10,8 +10,8 @@ Go into the Build folder and run cmake. However, notice:
 ** REPLACE C:\MinGW\bin\mingw32-make.exe with the path to your MinGW make.exe file.
 ** You have to have the C:\MinGW\bin in the path (or cmake will complain for missing libgmp-10.dll, etc).
 ** You must not have msys/bin in the path, it doesn't work with cmake
-** Use -DSTATIC_LIB if static libs are wanted. However, you will also need -DSTATIC_LIB to your own application when including Rocket files.
-** Notice that the generator "MinGW Makefiles" match the mingw32-make.exe, while the generator "msys Makefiles" match the msys/bin/make.exe. The first combination is used for 
+** Use -DROCKET_STATIC_LIB if static libs are wanted. However, you will also need -DROCKET_STATIC_LIB to your own application when including Rocket files.
+** Notice that the generator "MinGW Makefiles" match the mingw32-make.exe, while the generator "msys Makefiles" match the msys/bin/make.exe. The first combination is used for
 
 compiling from the DOS prompt, and the second one for compiling from a MinGW shell.