From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Sep 2008 18:24:57 -0500
Subject: Second Life viewer sources 1.21.0-RC

---
 linden/indra/llimagej2coj/CMakeLists.txt      |  31 +++++
 linden/indra/llimagej2coj/files.lst           |   1 -
 linden/indra/llimagej2coj/llimagej2coj.cpp    |   6 +-
 linden/indra/llimagej2coj/llimagej2coj.vcproj | 161 --------------------------
 4 files changed, 34 insertions(+), 165 deletions(-)
 create mode 100644 linden/indra/llimagej2coj/CMakeLists.txt
 delete mode 100644 linden/indra/llimagej2coj/files.lst
 delete mode 100755 linden/indra/llimagej2coj/llimagej2coj.vcproj

(limited to 'linden/indra/llimagej2coj')

diff --git a/linden/indra/llimagej2coj/CMakeLists.txt b/linden/indra/llimagej2coj/CMakeLists.txt
new file mode 100644
index 0000000..ed3ff3c
--- /dev/null
+++ b/linden/indra/llimagej2coj/CMakeLists.txt
@@ -0,0 +1,31 @@
+# -*- cmake -*-
+
+project(llimagej2coj)
+
+include(00-Common)
+include(LLCommon)
+include(LLImage)
+include(OpenJPEG)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLIMAGE_INCLUDE_DIRS}
+    ${OPENJPEG_INCLUDE_DIR}
+    )
+
+set(llimagej2coj_SOURCE_FILES
+    llimagej2coj.cpp
+    )
+
+set(llimagej2coj_HEADER_FILES
+    CMakeLists.txt
+
+    llimagej2coj.h
+    )
+
+set_source_files_properties(${llimagej2coj_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES})
+
+add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})
diff --git a/linden/indra/llimagej2coj/files.lst b/linden/indra/llimagej2coj/files.lst
deleted file mode 100644
index bbf359c..0000000
--- a/linden/indra/llimagej2coj/files.lst
+++ /dev/null
@@ -1 +0,0 @@
-llimagej2coj/llimagej2coj.cpp
diff --git a/linden/indra/llimagej2coj/llimagej2coj.cpp b/linden/indra/llimagej2coj/llimagej2coj.cpp
index 478cc84..983241c 100644
--- a/linden/indra/llimagej2coj/llimagej2coj.cpp
+++ b/linden/indra/llimagej2coj/llimagej2coj.cpp
@@ -33,7 +33,7 @@
 #include "llimagej2coj.h"
 
 // this is defined so that we get static linking.
-#include "openjpeg/openjpeg.h"
+#include "openjpeg.h"
 
 #include "lltimer.h"
 #include "llmemory.h"
@@ -268,12 +268,12 @@ BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, con
 
 	if (!comment_text)
 	{
-		parameters.cp_comment = "";
+		parameters.cp_comment = (char *) "";
 	}
 	else
 	{
 		// Awful hacky cast, too lazy to copy right now.
-		parameters.cp_comment = (char *)comment_text;
+		parameters.cp_comment = (char *) comment_text;
 	}
 
 	//
diff --git a/linden/indra/llimagej2coj/llimagej2coj.vcproj b/linden/indra/llimagej2coj/llimagej2coj.vcproj
deleted file mode 100755
index 637c81f..0000000
--- a/linden/indra/llimagej2coj/llimagej2coj.vcproj
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llimagej2coj"
-	ProjectGUID="{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}"
-	Keyword="CustomAppWizProj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llimage; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				OptimizeForProcessor="3"
-				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llimage; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				ForceConformanceInForLoopScope="TRUE"
-				WarningLevel="3"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				GlobalOptimizations="FALSE"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="FALSE"
-				OptimizeForProcessor="0"
-				OptimizeForWindowsApplication="FALSE"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llimage; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				ForceConformanceInForLoopScope="TRUE"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="">
-			<File
-				RelativePath=".\llimagej2coj.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="">
-			<File
-				RelativePath=".\llimagej2coj.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
-- 
cgit v1.1