svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers

2 files changed, 56 insertions, 5 deletions

diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
new file mode 100644
index 0000000000..9938a0198b
--- /dev/null
+++ b/indra/llrender/CMakeLists.txt
@@ -0,0 +1,51 @@
+# -*- cmake -*-
+
+project(llrender)
+
+include(00-Common)
+include(FreeType)
+include(LLCommon)
+include(LLImage)
+include(LLMath)
+include(LLRender)
+include(LLWindow)
+
+include_directories(
+    ${FREETYPE_INCLUDE_DIRS}
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLIMAGE_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLRENDER_INCLUDE_DIRS}
+    ${LLWINDOW_INCLUDE_DIRS}
+    )
+
+set(llrender_SOURCE_FILES
+    llfont.cpp
+    llfontgl.cpp
+    llgldbg.cpp
+    llglimmediate.cpp
+    llimagegl.cpp
+    llrendertarget.cpp
+    llvertexbuffer.cpp
+    llvertexprogramgl.cpp
+    )
+    
+set(llrender_HEADER_FILES
+    CMakeLists.txt
+
+    llfontgl.h
+    llfont.h
+    llgldbg.h
+    llglimmediate.h
+    llimagegl.h
+    llrendertarget.h
+    llvertexbuffer.h
+    llvertexprogramgl.h
+    )
+
+set_source_files_properties(${llrender_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llrender_SOURCE_FILES ${llrender_HEADER_FILES})
+
+add_library (llrender ${llrender_SOURCE_FILES})
diff --git a/indra/llrender/llgldbg.cpp b/indra/llrender/llgldbg.cpp
index 59a818d817..704cda9a23 100644
--- a/indra/llrender/llgldbg.cpp
+++ b/indra/llrender/llgldbg.cpp
@@ -43,7 +43,7 @@
 //------------------------------------------------------------------------
 // cmstr()
 //------------------------------------------------------------------------
-char *cmstr(int i)
+const char *cmstr(int i)
 {
 	switch( i )
 	{
@@ -59,7 +59,7 @@ char *cmstr(int i)
 //------------------------------------------------------------------------
 // facestr()
 //------------------------------------------------------------------------
-char *facestr(int i)
+const char *facestr(int i)
 {
 	switch( i )
 	{
@@ -81,7 +81,7 @@ const char *boolstr(int b)
 //------------------------------------------------------------------------
 // fv4()
 //------------------------------------------------------------------------
-char *fv4(F32 *f)
+const char *fv4(F32 *f)
 {
 	static char str[128];
 	sprintf(str, "%8.3f %8.3f %8.3f %8.3f", f[0], f[1], f[2], f[3]);
@@ -91,7 +91,7 @@ char *fv4(F32 *f)
 //------------------------------------------------------------------------
 // fv3()
 //------------------------------------------------------------------------
-char *fv3(F32 *f)
+const char *fv3(F32 *f)
 {
 	static char str[128];	/* Flawfinder: ignore */
 	snprintf(str, sizeof(str), "%8.3f, %8.3f, %8.3f", f[0], f[1], f[2]);	/* Flawfinder: ignore */
@@ -101,7 +101,7 @@ char *fv3(F32 *f)
 //------------------------------------------------------------------------
 // fv1()
 //------------------------------------------------------------------------
-char *fv1(F32 *f)
+const char *fv1(F32 *f)
 {
 	static char str[128];	/* Flawfinder: ignore */
 	snprintf(str, sizeof(str), "%8.3f", f[0]);		/* Flawfinder: ignore */