OU
/
CWE-ou-minkata
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
2
1
Fork 0
Code Releases Activity
Browse Source

Build 918 chunk 7: Add project plPluginJPEG and use it in AllDlls.sln 

Copy of plJPEG with added preprocessor definition IJL_SDK_AVAILABLE.

CW: I'm guessing that's the workaround for the missing JPEG textures issue we found during the 918 update verification.
MarkD: Exactly.
build918chunks^2
Christian Walther 11 years ago
parent
bb96412ffc
commit
a72cbd9248
2 changed files with 171 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/AllDlls/AllDlls.sln
  2. 156
      MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plPluginJPEG/plPluginJPEG.vcproj

30
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/AllDlls/AllDlls.sln
Unescape View File

@ -47,6 +47,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaxMain", "..\Tools\MaxMain
{3BF79823-CD88-4F09-8BCB-A13D39481322} = {3BF79823-CD88-4F09-8BCB-A13D39481322}
{4E991726-D69F-4786-A873-DF37FB4DABF9} = {4E991726-D69F-4786-A873-DF37FB4DABF9}
{30A84728-A436-40B9-A009-B117407145C2} = {30A84728-A436-40B9-A009-B117407145C2}
{FEB4D52D-8D4E-4520-A490-ADE06159B650} = {FEB4D52D-8D4E-4520-A490-ADE06159B650}
{58BE352F-CDB2-4A08-AC62-981800D018B0} = {58BE352F-CDB2-4A08-AC62-981800D018B0}
{907DBE31-5B7D-483D-AAF7-CABC24434EA7} = {907DBE31-5B7D-483D-AAF7-CABC24434EA7}
{5CB24835-47C1-4AE7-900E-70CBD1CC1DEA} = {5CB24835-47C1-4AE7-900E-70CBD1CC1DEA}
@ -91,7 +92,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaxMain", "..\Tools\MaxMain
{87B244B0-EAC3-4109-A395-898D1CFF0EBE} = {87B244B0-EAC3-4109-A395-898D1CFF0EBE}
{E8FE47B0-DF75-4D9F-9096-0BC204239B52} = {E8FE47B0-DF75-4D9F-9096-0BC204239B52}
{7A5E02B6-896A-49C2-8016-139CE23B3654} = {7A5E02B6-896A-49C2-8016-139CE23B3654}
{69E240B8-0ED6-4397-9DA6-133CC14F9E25} = {69E240B8-0ED6-4397-9DA6-133CC14F9E25}
{F57EFCBB-9B7F-46D2-946B-D5DCA4D6C921} = {F57EFCBB-9B7F-46D2-946B-D5DCA4D6C921}
{20917EBD-2A7E-49F5-A638-F5864265FF8C} = {20917EBD-2A7E-49F5-A638-F5864265FF8C}
{CFAA9EBF-A502-41F6-9784-0FC9CE7BFBA2} = {CFAA9EBF-A502-41F6-9784-0FC9CE7BFBA2}
@ -264,10 +264,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plIntersect", "..\Plasma\Pu
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plJPEG", "..\Plasma\PubUtilLib\plJPEG\plJPEG.vcproj", "{69E240B8-0ED6-4397-9DA6-133CC14F9E25}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plMath", "..\Plasma\PubUtilLib\plMath\plMath.vcproj", "{FCFFAE8F-D233-44D2-AAAD-4100FA274A32}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@ -496,6 +492,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plClipboard", "..\Plasma\Pu
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plPluginJPEG", "..\Plasma\PubUtilLib\plPluginJPEG\plPluginJPEG.vcproj", "{FEB4D52D-8D4E-4520-A490-ADE06159B650}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@ -885,16 +885,6 @@ Global
{0AE17996-56DF-4E88-8681-B115786D0DC9}.Release.Build.0 = Release|Win32
{0AE17996-56DF-4E88-8681-B115786D0DC9}.Release_Server.ActiveCfg = Release|Win32
{0AE17996-56DF-4E88-8681-B115786D0DC9}.Release_Server.Build.0 = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Debug.ActiveCfg = Debug|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Debug.Build.0 = Debug|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Debug_Server.ActiveCfg = Debug|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Debug_Server.Build.0 = Debug|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Ethereal Build.ActiveCfg = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Ethereal Build.Build.0 = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Release.ActiveCfg = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Release.Build.0 = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Release_Server.ActiveCfg = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Release_Server.Build.0 = Release|Win32
{FCFFAE8F-D233-44D2-AAAD-4100FA274A32}.Debug.ActiveCfg = Debug|Win32
{FCFFAE8F-D233-44D2-AAAD-4100FA274A32}.Debug.Build.0 = Debug|Win32
{FCFFAE8F-D233-44D2-AAAD-4100FA274A32}.Debug_Server.ActiveCfg = Debug|Win32
@ -1465,6 +1455,16 @@ Global
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release.Build.0 = Release|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release_Server.ActiveCfg = Release|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release_Server.Build.0 = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Debug.ActiveCfg = Debug|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Debug.Build.0 = Debug|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Debug_Server.ActiveCfg = Debug|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Debug_Server.Build.0 = Debug|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Ethereal Build.ActiveCfg = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Ethereal Build.Build.0 = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Release.ActiveCfg = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Release.Build.0 = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Release_Server.ActiveCfg = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Release_Server.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection

156
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plPluginJPEG/plPluginJPEG.vcproj
Unescape View File

@ -0,0 +1,156 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="plPluginJPEG"
ProjectGUID="{FEB4D52D-8D4E-4520-A490-ADE06159B650}"
SccProjectName=""
SccLocalPath="">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../../StaticSDKs/XPlatform/jpeg-8c-rgba;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IJL_SDK_AVAILABLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
ForceConformanceInForLoopScope="TRUE"
PrecompiledHeaderFile=""
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\Debug\plPluginJPEG.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;&quot;../../../../../StaticSDKs/XPlatform/jpeg-8c-rgba&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IJL_SDK_AVAILABLE"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
ForceConformanceInForLoopScope="TRUE"
PrecompiledHeaderFile=""
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\Release\plPluginJPEG.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plJPEG\plJPEG.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plJPEG\plJPEG.h">
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Write Preview
Loading…
Cancel
Save