Thread: [Hdrflow-svn] SF.net SVN: hdrflow: [410] trunk/lib/openlibraries (Page 2)
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn
|
From: <gl...@us...> - 2008-02-09 18:46:11
|
Revision: 410
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=410&view=rev
Author: glslang
Date: 2008-02-09 10:46:08 -0800 (Sat, 09 Feb 2008)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/openlibraries_iw_vc8.sln
trunk/lib/openlibraries/openlibraries_vc8.sln
trunk/lib/openlibraries/src/openimagelib/py/py_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.icproj
trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj
trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.icproj
trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
Modified: trunk/lib/openlibraries/openlibraries_iw_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_iw_vc8.sln 2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/openlibraries_iw_vc8.sln 2008-02-09 18:46:08 UTC (rev 410)
@@ -101,12 +101,6 @@
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "3D_lightmap", "src\openimagelib\plugins\3D_lightmap\3D_lightmap_vc8.icproj", "{54828EE2-BA89-4700-9E52-24A8A8301880}"
- ProjectSection(ProjectDependencies) = postProject
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- EndProjectSection
-EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "bmp", "src\openimagelib\plugins\bmp\bmp_vc8.icproj", "{847EA448-ED49-4A63-822E-6DBC2F760298}"
ProjectSection(ProjectDependencies) = postProject
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
@@ -149,12 +143,6 @@
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "psd", "src\openimagelib\plugins\psd\psd_vc8.icproj", "{A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE}"
- ProjectSection(ProjectDependencies) = postProject
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- EndProjectSection
-EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "quicktime", "src\openimagelib\plugins\quicktime\quicktime_vc8.icproj", "{123BEE85-5545-49D6-BC1A-B9D07187312A}"
ProjectSection(ProjectDependencies) = postProject
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
@@ -209,52 +197,14 @@
{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
EndProjectSection
EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.icproj", "{9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4}"
- ProjectSection(ProjectDependencies) = postProject
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SG", "SG", "{BD86F550-C573-4A68-955B-6CEDCC8F595D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{9483FC7B-E396-43E6-84ED-EB021AC54252}"
EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "sg", "src\openobjectlib\sg\sg_vc8.icproj", "{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}"
- ProjectSection(ProjectDependencies) = postProject
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "X3D", "src\openobjectlib\plugins\X3D\X3D_vc8.icproj", "{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}"
- ProjectSection(ProjectDependencies) = postProject
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AL", "AL", "{D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{56A6ABC4-51B3-45A3-ADDD-D22A50AA55F9}"
EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "al", "src\openassetlib\al\al_vc8.icproj", "{80261E5B-CC18-4844-B0C2-7D8B04671BAE}"
- ProjectSection(ProjectDependencies) = postProject
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
- {C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "py", "src\openassetlib\py\py_vc8.icproj", "{DCDE03E7-5170-4CB4-ACF5-E788CF12E283}"
- ProjectSection(ProjectDependencies) = postProject
- {80261E5B-CC18-4844-B0C2-7D8B04671BAE} = {80261E5B-CC18-4844-B0C2-7D8B04671BAE}
- EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "sqlite", "src\openassetlib\plugins\sqlite\sqlite_vc8.icproj", "{E18DF63F-8CDB-4377-8C5C-79FCC969E113}"
- ProjectSection(ProjectDependencies) = postProject
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {80261E5B-CC18-4844-B0C2-7D8B04671BAE} = {80261E5B-CC18-4844-B0C2-7D8B04671BAE}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{C2EBF114-BFF6-4520-BC11-EB54565B92D6}"
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "_2D", "test\openimagelib\GL\_2D\_2D_vc8.icproj", "{EC14269B-467D-4AE7-94B1-F6F4B6280543}"
@@ -317,30 +267,6 @@
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "multipass_draw", "test\openobjectlib\GL\multipass_draw\multipass_draw_vc8.icproj", "{40ABEE3D-14F3-490A-8919-CEAE879BCF28}"
- ProjectSection(ProjectDependencies) = postProject
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
- EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "noise_volume", "test\openobjectlib\GL\noise_volume\noise_volume_vc8.icproj", "{BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40}"
- ProjectSection(ProjectDependencies) = postProject
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "obj_draw", "test\openobjectlib\GL\obj_draw\obj_draw_vc8.icproj", "{68B88FAE-568D-4CED-90F4-3FDA1BCC481D}"
- ProjectSection(ProjectDependencies) = postProject
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
- EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "texture_draw", "test\openobjectlib\GL\texture_draw\texture_draw_vc8.icproj", "{840428EF-8268-4F4D-878C-DAB32E8D5AC8}"
- ProjectSection(ProjectDependencies) = postProject
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{B972DCEB-386E-42D2-8C5E-DD2942EC7F63}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{C85EDDFB-1A91-4ABD-8E86-6AFDF0C85CBA}"
@@ -370,17 +296,6 @@
{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
EndProjectSection
EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "jpg", "src\openimagelib\plugins\jpg\jpg_vc8.icproj", "{BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}"
- ProjectSection(ProjectDependencies) = postProject
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "obj", "src\openobjectlib\plugins\wavefront\obj_vc8.icproj", "{DDF3D73D-8E68-403E-A5D8-0F3D3231E590}"
- ProjectSection(ProjectDependencies) = postProject
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -443,10 +358,6 @@
{4AF3F015-09ED-47CC-A30C-0ECC1C1BB557}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{4AF3F015-09ED-47CC-A30C-0ECC1C1BB557}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{4AF3F015-09ED-47CC-A30C-0ECC1C1BB557}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {54828EE2-BA89-4700-9E52-24A8A8301880}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {54828EE2-BA89-4700-9E52-24A8A8301880}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {54828EE2-BA89-4700-9E52-24A8A8301880}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {54828EE2-BA89-4700-9E52-24A8A8301880}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{847EA448-ED49-4A63-822E-6DBC2F760298}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{847EA448-ED49-4A63-822E-6DBC2F760298}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{847EA448-ED49-4A63-822E-6DBC2F760298}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -475,10 +386,6 @@
{6C5F9915-54DD-4C1F-9CD1-6112D80BBE8C}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{6C5F9915-54DD-4C1F-9CD1-6112D80BBE8C}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{6C5F9915-54DD-4C1F-9CD1-6112D80BBE8C}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{123BEE85-5545-49D6-BC1A-B9D07187312A}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{123BEE85-5545-49D6-BC1A-B9D07187312A}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{123BEE85-5545-49D6-BC1A-B9D07187312A}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -511,30 +418,6 @@
{1BECC806-7A92-409B-A6F2-1FA6AB42E0A5}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{1BECC806-7A92-409B-A6F2-1FA6AB42E0A5}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{1BECC806-7A92-409B-A6F2-1FA6AB42E0A5}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {80261E5B-CC18-4844-B0C2-7D8B04671BAE}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {80261E5B-CC18-4844-B0C2-7D8B04671BAE}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {80261E5B-CC18-4844-B0C2-7D8B04671BAE}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {80261E5B-CC18-4844-B0C2-7D8B04671BAE}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {DCDE03E7-5170-4CB4-ACF5-E788CF12E283}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {DCDE03E7-5170-4CB4-ACF5-E788CF12E283}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {DCDE03E7-5170-4CB4-ACF5-E788CF12E283}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {DCDE03E7-5170-4CB4-ACF5-E788CF12E283}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {E18DF63F-8CDB-4377-8C5C-79FCC969E113}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {E18DF63F-8CDB-4377-8C5C-79FCC969E113}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {E18DF63F-8CDB-4377-8C5C-79FCC969E113}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {E18DF63F-8CDB-4377-8C5C-79FCC969E113}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{EC14269B-467D-4AE7-94B1-F6F4B6280543}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{EC14269B-467D-4AE7-94B1-F6F4B6280543}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{EC14269B-467D-4AE7-94B1-F6F4B6280543}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -575,22 +458,6 @@
{105D3AE5-6D9E-40FC-A0AD-89DC3C795121}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{105D3AE5-6D9E-40FC-A0AD-89DC3C795121}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{105D3AE5-6D9E-40FC-A0AD-89DC3C795121}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {40ABEE3D-14F3-490A-8919-CEAE879BCF28}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {40ABEE3D-14F3-490A-8919-CEAE879BCF28}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {40ABEE3D-14F3-490A-8919-CEAE879BCF28}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {40ABEE3D-14F3-490A-8919-CEAE879BCF28}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {68B88FAE-568D-4CED-90F4-3FDA1BCC481D}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {68B88FAE-568D-4CED-90F4-3FDA1BCC481D}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {68B88FAE-568D-4CED-90F4-3FDA1BCC481D}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {68B88FAE-568D-4CED-90F4-3FDA1BCC481D}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {840428EF-8268-4F4D-878C-DAB32E8D5AC8}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {840428EF-8268-4F4D-878C-DAB32E8D5AC8}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {840428EF-8268-4F4D-878C-DAB32E8D5AC8}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {840428EF-8268-4F4D-878C-DAB32E8D5AC8}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{68A41D6B-F6DB-4A26-9202-22950CC80697}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{68A41D6B-F6DB-4A26-9202-22950CC80697}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{68A41D6B-F6DB-4A26-9202-22950CC80697}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -607,14 +474,6 @@
{52CD991C-C495-4EB9-80D2-D9E1F809AA9B}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{52CD991C-C495-4EB9-80D2-D9E1F809AA9B}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{52CD991C-C495-4EB9-80D2-D9E1F809AA9B}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{2B35E24C-CFD8-4658-ADC5-9C831B6181D5}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{2B35E24C-CFD8-4658-ADC5-9C831B6181D5}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{2B35E24C-CFD8-4658-ADC5-9C831B6181D5}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -671,10 +530,6 @@
{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -703,10 +558,6 @@
{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -739,30 +590,6 @@
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -803,22 +630,6 @@
{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -835,12 +646,6 @@
{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -888,7 +693,6 @@
{B972DCEB-386E-42D2-8C5E-DD2942EC7F63} = {BEF92EC2-7872-48E2-BF6F-3DE4EBA9C037}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {51ECF4DE-6959-485D-9D68-A055E45393DD}
{4AF3F015-09ED-47CC-A30C-0ECC1C1BB557} = {51ECF4DE-6959-485D-9D68-A055E45393DD}
- {54828EE2-BA89-4700-9E52-24A8A8301880} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{847EA448-ED49-4A63-822E-6DBC2F760298} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{05C95FA3-7755-4F6E-8D87-79CA433A481C} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{70559110-3095-4653-B905-3332F81FB48C} = {D9066C6C-E143-472F-860E-004E481F3E0A}
@@ -896,24 +700,15 @@
{D2A54593-9912-4A94-950C-4204994E5AD0} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{82F69659-47F1-44E2-A6AF-7E125BFE333B} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{6C5F9915-54DD-4C1F-9CD1-6112D80BBE8C} = {D9066C6C-E143-472F-860E-004E481F3E0A}
- {A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{123BEE85-5545-49D6-BC1A-B9D07187312A} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{F29DD922-4E1C-4A7D-B388-FB4FCA97F369} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{FA6FE539-D58B-4963-BC62-F0F5AE9D07A2} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{FF86DCCC-8D8F-4016-B4BC-6699963EEEE1} = {D9066C6C-E143-472F-860E-004E481F3E0A}
- {BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
{7A534984-2C4F-43EB-9ED1-F47E0E1C07F5} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
{B7855283-738F-4ADF-9C7C-5BFFDD5B537F} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{FC5B483A-2782-4DB8-88FC-CDF767A067D5} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{1BECC806-7A92-409B-A6F2-1FA6AB42E0A5} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
- {9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {BD86F550-C573-4A68-955B-6CEDCC8F595D}
- {CF7C26D5-4EB0-41C9-BB84-9E655A0227F6} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
- {80261E5B-CC18-4844-B0C2-7D8B04671BAE} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
- {DCDE03E7-5170-4CB4-ACF5-E788CF12E283} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
- {E18DF63F-8CDB-4377-8C5C-79FCC969E113} = {56A6ABC4-51B3-45A3-ADDD-D22A50AA55F9}
{EC14269B-467D-4AE7-94B1-F6F4B6280543} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
{5CBC56F0-7DF5-437C-A59D-5ECD4CAF21DC} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
{30E45B23-A206-4803-833F-23445A872619} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
@@ -922,10 +717,6 @@
{1B8C0271-A3E1-4B9F-A3D2-8AD59994AD8A} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
{009731D9-D224-48AB-A8F4-B5C584A0FAEF} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
{83613041-D1A9-40E0-92C7-AB9B5B1CF30B} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
- {BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
- {68B88FAE-568D-4CED-90F4-3FDA1BCC481D} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
- {840428EF-8268-4F4D-878C-DAB32E8D5AC8} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
- {40ABEE3D-14F3-490A-8919-CEAE879BCF28} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
{68A41D6B-F6DB-4A26-9202-22950CC80697} = {C85EDDFB-1A91-4ABD-8E86-6AFDF0C85CBA}
EndGlobalSection
EndGlobal
Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln 2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln 2008-02-09 18:46:08 UTC (rev 410)
@@ -101,12 +101,6 @@
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3D_lightmap", "src\openimagelib\plugins\3D_lightmap\3D_lightmap_vc8.vcproj", "{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}"
- ProjectSection(ProjectDependencies) = postProject
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmp", "src\openimagelib\plugins\bmp\bmp_vc8.vcproj", "{261595DD-FB76-4D37-A3C8-0D9625C20D46}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
@@ -149,12 +143,6 @@
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "psd", "src\openimagelib\plugins\psd\psd_vc8.vcproj", "{FF23E252-5FD9-4642-9563-1111B12D8EE7}"
- ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openimagelib\plugins\quicktime\quicktime_vc8.vcproj", "{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
@@ -209,13 +197,6 @@
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
- ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SG", "SG", "{BD86F550-C573-4A68-955B-6CEDCC8F595D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{9483FC7B-E396-43E6-84ED-EB021AC54252}"
@@ -389,10 +370,6 @@
{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -421,10 +398,6 @@
{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -457,10 +430,6 @@
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -572,7 +541,6 @@
{B972DCEB-386E-42D2-8C5E-DD2942EC7F63} = {BEF92EC2-7872-48E2-BF6F-3DE4EBA9C037}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {51ECF4DE-6959-485D-9D68-A055E45393DD}
{8EB61E38-3457-4312-B8F9-D29CA73E30B6} = {51ECF4DE-6959-485D-9D68-A055E45393DD}
- {B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{261595DD-FB76-4D37-A3C8-0D9625C20D46} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{875CE227-A98F-4711-9496-61BC21DA88B8} = {D9066C6C-E143-472F-860E-004E481F3E0A}
@@ -580,7 +548,6 @@
{08D0F0FA-947B-4AAF-90A8-7FBFC5EBD51B} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{972FF7FA-BDBE-400E-BDF6-59C13A6AE74D} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{4A6B0F4F-676E-4A96-A990-62464D923ED2} = {D9066C6C-E143-472F-860E-004E481F3E0A}
- {FF23E252-5FD9-4642-9563-1111B12D8EE7} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{291BFF23-61D3-4355-8AA5-C8BF0FE30CB0} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{227A0088-F3AE-4CA7-941C-0283D44F1678} = {D9066C6C-E143-472F-860E-004E481F3E0A}
@@ -590,7 +557,6 @@
{88BCD57E-044F-4427-A407-541BA8A938E6} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{A60E2710-2DA9-4641-AEF6-6488A6264723} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
- {1AC3D22B-175B-4169-B74A-276F9D5BA7AB} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{24D622CC-4577-49B0-9224-8BB191236A61} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.icproj 2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.icproj 2008-02-09 18:46:08 UTC (rev 410)
@@ -4,17 +4,14 @@
Version="10.0"
Name="py"
ProjectGUID="{4AF3F015-09ED-47CC-A30C-0ECC1C1BB557}"
- RootNamespace="py"
- Keyword="Win32Proj"
VCNestedProjectGUID="{8EB61E38-3457-4312-B8F9-D29CA73E30B6}"
- VCNestedProjectCRC32="136617910"
- VCNestedProjectFileName="py_vc8.vcproj">
+ VCNestedProjectCRC32="4102186171"
+ VCNestedProjectFileName="py_vc8.vcproj"
+ Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
- <ToolFiles>
- </ToolFiles>
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32">
@@ -25,62 +22,49 @@
ConfigurationType="2"
CharacterSet="1"/>
<Tool
- Name="PreBuildEventTool"/>
- <Tool
- Name="CustomTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="MidlCmplrTool"/>
- <Tool
Name="CppCmplrTool"
Optimization="0"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\Python25\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;HAVE_FLEX_STRING"
- MinimalRebuild="true"
+ MinimalRebuild="1"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ Detect64BitPortabilityProblems="1"
+ DebugInformationFormat="4"
+ OpenMP="1"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="ResCmplrTool"/>
- <Tool
- Name="PreLinkEventTool"/>
- <Tool
Name="LinkerTool"
- IgnoreImportLibrary="true"
- AdditionalOptions="/LARGEADDRESSAWARE"
+ DelayImpLib=""
+ IgnoreImportLibrary="1"
AdditionalDependencies="boost_python-vc80-mt-gd-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowImage.pyd"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\Python25\Libs"
- GenerateDebugInformation="true"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
+ GenerateDebugInformation="1"
SubSystem="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ AdditionalOptions="/LARGEADDRESSAWARE"/>
<Tool
- Name="VCALinkTool"/>
+ Name="LibrarianTool"/>
<Tool
- Name="VCManifestTool"/>
+ Name="ResCmplrTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="MidlCmplrTool"/>
<Tool
Name="BscMakeTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="PreBuildEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="PreLinkEventTool"/>
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
Name="PostBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="CustomNodeTool"/>
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32">
@@ -92,94 +76,61 @@
CharacterSet="1"
WholeProgramOptimization="1"/>
<Tool
- Name="PreBuildEventTool"/>
- <Tool
- Name="CustomTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="MidlCmplrTool"/>
- <Tool
Name="CppCmplrTool"
+ WholeProgramOptimization="1"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\Python25\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
- BufferSecurityCheck="false"
- FloatingPointModel="2"
- OpenMP="true"
+ BufferSecurityCheck="0"
UsePrecompiledHeader="0"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ Detect64BitPortabilityProblems="1"
+ DebugInformationFormat="3"
+ OpenMP="1"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="ResCmplrTool"/>
- <Tool
- Name="PreLinkEventTool"/>
- <Tool
Name="LinkerTool"
- IgnoreImportLibrary="true"
- AdditionalOptions="/LARGEADDRESSAWARE"
+ DelayImpLib=""
+ IgnoreImportLibrary="1"
AdditionalDependencies="boost_python-vc80-mt-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowImage.pyd"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\Python25\Libs"
- GenerateDebugInformation="true"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
+ GenerateDebugInformation="1"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ AdditionalOptions="/LARGEADDRESSAWARE"/>
<Tool
- Name="VCALinkTool"/>
+ Name="LibrarianTool"/>
<Tool
- Name="VCManifestTool"/>
+ Name="ResCmplrTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="MidlCmplrTool"/>
<Tool
Name="BscMakeTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="PreBuildEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="PreLinkEventTool"/>
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
Name="PostBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="CustomNodeTool"/>
</Configuration>
</Configurations>
- <References>
- </References>
<Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File
- RelativePath=".\il.cpp">
- </File>
- <File
- RelativePath=".\py.cpp">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <File
- RelativePath=".\py.hpp">
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- </Filter>
+ <File
+ RelativePath=".\py.hpp"/>
+ <File
+ RelativePath=".\il.cpp"/>
+ <File
+ RelativePath=".\lut_functions.cpp"/>
+ <File
+ RelativePath=".\py.cpp"/>
</Files>
- <Globals>
- </Globals>
</VisualStudioProject>
Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2008-02-09 18:46:08 UTC (rev 410)
@@ -68,7 +68,7 @@
AdditionalDependencies="boost_python-vc80-mt-gd-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowImage.pyd"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\Python25\Libs"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -123,6 +123,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ WholeProgramOptimization="true"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\Python25\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;HAVE_FLEX_STRING"
ExceptionHandling="2"
@@ -151,7 +152,7 @@
AdditionalDependencies="boost_python-vc80-mt-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowImage.pyd"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\Python25\Libs"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2008-02-09 18:46:08 UTC (rev 410)
@@ -27,14 +27,8 @@
#endif
#ifndef OPENPLUGINLIB_TOOLSET
-# if defined( _MSC_VER ) && ( _MSC_VER == 1310 ) && !defined( __ICL )
-# define OPENPLUGINLIB_TOOLSET "vc71"
-
-# elif defined( _MSC_VER ) && ( _MSC_VER >= 1400 )
+# if defined( _MSC_VER ) && ( _MSC_VER >= 1400 )
# define OPENPLUGINLIB_TOOLSET "vc80"
-
-# elif defined( __ICL ) && ( __INTEL_COMPILER >= 900 ) && ( _MSC_VER == 1310 )
-# define OPENPLUGINLIB_TOOLSET "iw-vc71"
# endif
#endif
Modified: trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.icproj 2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.icproj 2008-02-09 18:46:08 UTC (rev 410)
@@ -4,17 +4,14 @@
Version="10.0"
Name="rescaler_bench"
ProjectGUID="{52CD991C-C495-4EB9-80D2-D9E1F809AA9B}"
- RootNamespace="rescaler_bench"
- Keyword="Win32Proj"
VCNestedProjectGUID="{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}"
- VCNestedProjectCRC32="3480937260"
- VCNestedProjectFileName="rescaler_bench_vc8.vcproj">
+ VCNestedProjectCRC32="4056980913"
+ VCNestedProjectFileName="rescaler_bench_vc8.vcproj"
+ Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
- <ToolFiles>
- </ToolFiles>
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32">
@@ -25,60 +22,47 @@
ConfigurationType="1"
CharacterSet="1"/>
<Tool
- Name="PreBuildEventTool"/>
- <Tool
- Name="CustomTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="MidlCmplrTool"/>
- <Tool
Name="CppCmplrTool"
Optimization="0"
AdditionalIncludeDirectories="$(SolutionDir)\src;"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
- MinimalRebuild="true"
+ MinimalRebuild="1"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
+ Detect64BitPortabilityProblems="1"
DebugInformationFormat="4"
- DisableSpecificWarnings="4503"/>
+ DisableSpecificWarnings="4503"
+ OpenMP="1"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="ResCmplrTool"/>
- <Tool
- Name="PreLinkEventTool"/>
- <Tool
Name="LinkerTool"
- AdditionalOptions="/LARGEADDRESSAWARE"
+ DelayImpLib=""
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib"
- GenerateDebugInformation="true"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName)"
+ GenerateDebugInformation="1"
SubSystem="1"
- TargetMachine="1"/>
+ TargetMachine="1"
+ AdditionalOptions="/LARGEADDRESSAWARE"/>
<Tool
- Name="VCALinkTool"/>
+ Name="LibrarianTool"/>
<Tool
- Name="VCManifestTool"/>
+ Name="ResCmplrTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="MidlCmplrTool"/>
<Tool
Name="BscMakeTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="PreBuildEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="PreLinkEventTool"/>
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
Name="PostBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="CustomNodeTool"/>
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32">
@@ -90,86 +74,53 @@
CharacterSet="1"
WholeProgramOptimization="1"/>
<Tool
- Name="PreBuildEventTool"/>
- <Tool
- Name="CustomTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="MidlCmplrTool"/>
- <Tool
Name="CppCmplrTool"
+ WholeProgramOptimization="1"
AdditionalIncludeDirectories="$(SolutionDir)\src;"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
ExceptionHandling="2"
RuntimeLibrary="2"
- BufferSecurityCheck="false"
- FloatingPointModel="2"
- OpenMP="true"
+ BufferSecurityCheck="0"
UsePrecompiledHeader="0"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
+ Detect64BitPortabilityProblems="1"
DebugInformationFormat="3"
- DisableSpecificWarnings="4503"/>
+ DisableSpecificWarnings="4503"
+ OpenMP="1"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="ResCmplrTool"/>
- <Tool
- Name="PreLinkEventTool"/>
- <Tool
Name="LinkerTool"
- AdditionalOptions="/LARGEADDRESSAWARE"
+ DelayImpLib=""
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib"
- GenerateDebugInformation="true"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName)"
+ GenerateDebugInformation="1"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ AdditionalOptions="/LARGEADDRESSAWARE"/>
<Tool
- Name="VCALinkTool"/>
+ Name="LibrarianTool"/>
<Tool
- Name="VCManifestTool"/>
+ Name="ResCmplrTool"/>
<Tool
- Name="VCXDCMakeTool"/>
+ Name="MidlCmplrTool"/>
<Tool
Name="BscMakeTool"/>
<Tool
- Name="VCFxCopTool"/>
+ Name="PreBuildEventTool"/>
<Tool
- Name="VCAppVerifierTool"/>
+ Name="PreLinkEventTool"/>
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
Name="PostBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="CustomNodeTool"/>
</Configuration>
</Configurations>
- <References>
- </References>
<Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File
- RelativePath=".\rescaler_bench.cpp">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- </Filter>
+ <File
+ RelativePath=".\rescaler_bench.cpp"/>
</Files>
- <Globals>
- </Globals>
</VisualStudioProject>
Modified: trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj 2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj 2008-02-09 18:46:08 UTC (rev 410)
@@ -66,7 +66,7 @@
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -121,6 +121,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(SolutionDir)\src;"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
ExceptionHandling="2"
@@ -147,7 +148,7 @@
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.icproj 2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.icproj 2008-02-09 18:46:08 UTC (rev 410)
@@ -4,17 +4,14 @@
Version="10.0"
Name="tm_bench"
ProjectGUID="{6217C9BE-C025-48E5-BBB6-258BDF3ED5F3}"
- RootNamespace="tm_bench"
- Keyword="Win32Proj"
VCNestedProjectGUID="{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
- VCNestedProjectCRC32="948879944"
- VCNestedProjectFileName="tm_bench_vc8.vcproj">
+ VCNestedProjectCRC32="3089716335"
+ VCNestedProjectFileName="tm_bench_vc8.vcproj"
+ Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
- <ToolFiles>
- </ToolFiles>
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32">
@@ -25,60 +22,47 @@
ConfigurationType="1"
CharacterSet="1"/>
<Tool
- Name="PreBuildEventTool"/>
- <Tool
- Name="CustomTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="MidlCmplrTool"/>
- <Tool
Name="CppCmplrTool"
Optimization="0"
AdditionalIncludeDirectories="$(SolutionDir)\src;"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
- MinimalRebuild="true"
+ MinimalRebuild="1"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
+ Detect64BitPortabilityProblems="1"
DebugInformationFormat="4"
- DisableSpecificWarnings="4503"/>
+ DisableSpecificWarnings="4503"
+ OpenMP="1"/>
<Tool
- Name="VCManagedResourceCompilerTool"/>
- <Tool
- Name="ResCmplrTool"/>
- <Tool
- Name="PreLinkEventTool"/>
- <Tool
Name="LinkerTool"
- AdditionalOptions="/LARGEADDRESSAWARE"
+ DelayImpLib=""
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib"
- GenerateDebugInformation="true"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openme...
[truncated message content] |
|
From: <gl...@us...> - 2008-02-23 18:29:16
|
Revision: 422
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=422&view=rev
Author: glslang
Date: 2008-02-23 10:29:14 -0800 (Sat, 23 Feb 2008)
Log Message:
-----------
+ have all targets go to a single directory (win32 only)
Modified Paths:
--------------
trunk/lib/openlibraries/installer/hdrflow_runtime.nsi
trunk/lib/openlibraries/installer/hdrflow_sdk.nsi
trunk/lib/openlibraries/openlibraries_vc8.sln
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj
Modified: trunk/lib/openlibraries/installer/hdrflow_runtime.nsi
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_runtime.nsi 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/installer/hdrflow_runtime.nsi 2008-02-23 18:29:14 UTC (rev 422)
@@ -80,10 +80,8 @@
SetOverwrite on
- SetOutPath $INSTDIR\bin
- File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
- File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
+ SetOutPath $INSTDIR\DLLs
+ File "..\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
; dependencies
File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
@@ -101,48 +99,8 @@
; Python
SetOutPath $INSTDIR\python
- File "..\src\openpluginlib\py\Multi-threaded Release DLL\HDRFlowPlugin.pyd"
- File "..\src\openimagelib\py\Multi-threaded Release DLL\HDRFlowImage.pyd"
- File "..\src\openmedialib\py\Multi-threaded Release DLL\HDRFlowMedia.pyd"
+ File "Multi-threaded Release DLL\*.pyd"
- SetOutPath $INSTDIR\plugins\release
-; File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-; File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
- File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
- File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
- File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
- File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
- File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll"
-; File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
-; File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
- File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
- File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
- File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl"
- File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-${VERSION}.dll"
- File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
- File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
-; File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-; File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
-; File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-; File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
- File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
- File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll"
-; File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
-; File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
-; File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
-; File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
-; File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
-; File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
- File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
- File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
-
SetOutPath $INSTDIR\shaders
File "..\effects\shaders\sepia.cg"
File "..\effects\shaders\sepia.frag"
@@ -164,10 +122,9 @@
;--------------------------------
;Path environment variable
- Push "$INSTDIR\bin"
+ Push "$INSTDIR\DLLs"
Call AddToPath
- Push "$INSTDIR\bin\Release"
- Call AddToPath
+
;--------------------------------
;Python environment variable
Push "PYTHONPATH"
@@ -178,7 +135,7 @@
;Registry
WriteRegStr HKLM "Software\HDRFlow" "CurrentVersion" "${VERSION_DOT}"
-WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease" "$INSTDIR\plugins\release"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease" "$INSTDIR\DLLs"
WriteRegStr HKLM "Software\HDRFlow" "KernelsDir" "$INSTDIR\kernels"
WriteRegStr HKLM "Software\HDRFlow" "ShadersDir" "$INSTDIR\shaders"
@@ -212,19 +169,15 @@
DeleteRegKey HKLM "Software\HDRFlow"
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow"
- Push "$INSTDIR\bin"
+ Push "$INSTDIR\DLLs"
Call un.RemoveFromPath
- Push "$INSTDIR\bin\Release"
- Call un.RemoveFromPath
-
Push "PYTHONPATH"
Call un.DeleteEnvStr
- RMDir /r $INSTDIR\bin
+ RMDir /r $INSTDIR\DLLs
RMDir /r $INSTDIR\include
RMDir /r $INSTDIR\lib
- RMDir /r $INSTDIR\plugins
RMDir /r $INSTDIR\kernels
RMDir /r $INSTDIR\shaders
RMDir /r $INSTDIR
Modified: trunk/lib/openlibraries/installer/hdrflow_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_sdk.nsi 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/installer/hdrflow_sdk.nsi 2008-02-23 18:29:14 UTC (rev 422)
@@ -143,13 +143,9 @@
File ..\src\openmedialib\ml\store.hpp
File ..\src\openmedialib\ml\utilities.hpp
- SetOutPath $INSTDIR\bin
- File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.dll"
- File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.dll"
- File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
- File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.dll"
- File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
+ SetOutPath $INSTDIR\DLLs
+ File "..\Multi-threaded Debug DLL\*-vc80-d-${VERSION}.dll"
+ File "..\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
; dependencies
File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
@@ -167,94 +163,14 @@
; Python
SetOutPath $INSTDIR\python
- File "..\src\openpluginlib\py\Multi-threaded Debug DLL\HDRFlowPlugin.pyd"
- File "..\src\openimagelib\py\Multi-threaded Debug DLL\HDRFlowImage.pyd"
- File "..\src\openmedialib\py\Multi-threaded Debug DLL\HDRFlowMedia.pyd"
+ File "..\Multi-threaded Debug DLL\HDRFlowPlugin.pyd"
+ File "..\Multi-threaded Debug DLL\HDRFlowImage.pyd"
+ File "..\Multi-threaded Debug DLL\HDRFlowMedia.pyd"
SetOutPath $INSTDIR\lib
- File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.lib"
- File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.lib"
- File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.lib"
- File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.lib"
- File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.lib"
- File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.lib"
-
- SetOutPath $INSTDIR\plugins\debug
-; File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-; File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Debug DLL\openimagelib_3D_lightmap-vc80-d-${VERSION}.dll"
- File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
- File "..\src\openimagelib\plugins\dds\Multi-threaded Debug DLL\openimagelib_dds-vc80-d-${VERSION}.dll"
- File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
- File "..\src\openimagelib\plugins\dpx\Multi-threaded Debug DLL\openimagelib_dpx-vc80-d-${VERSION}.dll"
- File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
- File "..\src\openimagelib\plugins\exr\Multi-threaded Debug DLL\openimagelib_exr-vc80-d-${VERSION}.dll"
- File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
- File "..\src\openimagelib\plugins\gdi+\Multi-threaded Debug DLL\openimagelib_gdi-vc80-d-${VERSION}.dll"
- File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
- File "..\src\openimagelib\plugins\hdr\Multi-threaded Debug DLL\openimagelib_hdr-vc80-d-${VERSION}.dll"
-; File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
-; File "..\src\openimagelib\plugins\jpg\Multi-threaded Debug DLL\openimagelib_jpg-vc80-d-${VERSION}.dll"
- File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
- File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-${VERSION}.dll"
- File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
- File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-${VERSION}.dll"
- File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl"
- File "..\src\openmedialib\plugins\avformat\Multi-threaded Debug DLL\openmedialib_avformat-vc80-d-${VERSION}.dll"
- File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
- File "..\src\openmedialib\plugins\oil\Multi-threaded Debug DLL\openmedialib_oil-vc80-d-${VERSION}.dll"
-; File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-; File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-${VERSION}.dll"
-; File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-; File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-${VERSION}.dll"
- File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
- File "..\src\openmedialib\plugins\ofx\Multi-threaded Debug DLL\openmedialib_ofx-vc80-d-${VERSION}.dll"
-; File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
-; File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-${VERSION}.dll"
-; File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
-; File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
-; File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
-; File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll"
- File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
- File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-${VERSION}.dll"
+ File "..\Multi-threaded Debug DLL\*-vc80-d-${VERSION}.lib"
+ File "..\Multi-threaded Release DLL\*-vc80-r-${VERSION}.lib"
- SetOutPath $INSTDIR\plugins\release
-; File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-; File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
- File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
- File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
- File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
- File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
- File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll"
-; File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
-; File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
- File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
- File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
- File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
- File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl"
- File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-${VERSION}.dll"
- File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
- File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
-; File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-; File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
-; File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-; File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
- File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
- File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll"
-; File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
-; File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
-; File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
-; File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
-; File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
-; File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
- File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
- File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
-
SetOutPath $INSTDIR\shaders
File "..\effects\shaders\sepia.cg"
File "..\effects\shaders\sepia.frag"
@@ -276,7 +192,7 @@
;--------------------------------
;Path environment variable
- Push "$INSTDIR\bin"
+ Push "$INSTDIR\DLLs"
Call AddToPath
;--------------------------------
@@ -301,8 +217,8 @@
;Registry
WriteRegStr HKLM "Software\HDRFlow" "CurrentVersion" "${VERSION_DOT}"
-WriteRegStr HKLM "Software\HDRFlow" "PluginsDirDebug" "$INSTDIR\plugins\debug"
-WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease" "$INSTDIR\plugins\release"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirDebug" "$INSTDIR\plugins\DLLs"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease" "$INSTDIR\plugins\DLLs"
WriteRegStr HKLM "Software\HDRFlow" "KernelsDir" "$INSTDIR\kernels"
WriteRegStr HKLM "Software\HDRFlow" "ShadersDir" "$INSTDIR\shaders"
@@ -336,7 +252,7 @@
DeleteRegKey HKLM "Software\HDRFlow"
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow"
- Push "$INSTDIR\bin"
+ Push "$INSTDIR\DLLs"
Call un.RemoveFromPath
Push "HDRFLOW_LIB_PATH"
@@ -348,7 +264,7 @@
Push "PYTHONPATH"
Call un.DeleteEnvStr
- RMDir /r $INSTDIR\bin
+ RMDir /r $INSTDIR\DLLs
RMDir /r $INSTDIR\include
RMDir /r $INSTDIR\lib
RMDir /r $INSTDIR\plugins
Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln 2008-02-23 18:29:14 UTC (rev 422)
@@ -101,12 +101,6 @@
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmp", "src\openimagelib\plugins\bmp\bmp_vc8.vcproj", "{261595DD-FB76-4D37-A3C8-0D9625C20D46}"
- ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dds", "src\openimagelib\plugins\dds\dds_vc8.vcproj", "{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE}"
ProjectSection(ProjectDependencies) = postProject
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
@@ -370,10 +364,6 @@
{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -541,7 +531,6 @@
{B972DCEB-386E-42D2-8C5E-DD2942EC7F63} = {BEF92EC2-7872-48E2-BF6F-3DE4EBA9C037}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {51ECF4DE-6959-485D-9D68-A055E45393DD}
{8EB61E38-3457-4312-B8F9-D29CA73E30B6} = {51ECF4DE-6959-485D-9D68-A055E45393DD}
- {261595DD-FB76-4D37-A3C8-0D9625C20D46} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{875CE227-A98F-4711-9496-61BC21DA88B8} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{17CBC457-3279-40F9-A614-A69046132424} = {D9066C6C-E143-472F-860E-004E481F3E0A}
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -101,7 +101,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -18,7 +18,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -109,7 +109,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -103,7 +103,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -100,7 +100,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -102,7 +102,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -102,7 +102,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -105,7 +105,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -103,7 +103,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -103,7 +103,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -102,7 +102,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -103,7 +103,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -101,7 +101,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -100,7 +100,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -18,7 +18,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -102,7 +102,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -18,7 +18,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -102,7 +102,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -18,7 +18,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -101,7 +101,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -18,7 +18,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -100,7 +100,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -18,7 +18,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -102,7 +102,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -18,7 +18,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -102,7 +102,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -18,7 +18,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -102,7 +102,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -18,7 +18,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -105,7 +105,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
Modified: trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
+++ trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj 2008-02-23 18:29:14 UTC (rev 422)
@@ -18,7 +18,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -104,7 +104,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2008-02-24 10:53:30
|
Revision: 424
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=424&view=rev
Author: glslang
Date: 2008-02-24 02:53:28 -0800 (Sun, 24 Feb 2008)
Log Message:
-----------
+ have all *.opl be installed in the target dir after build (win32 only)
Modified Paths:
--------------
trunk/lib/openlibraries/installer/hdrflow_runtime.nsi
trunk/lib/openlibraries/installer/hdrflow_sdk.nsi
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
Modified: trunk/lib/openlibraries/installer/hdrflow_runtime.nsi
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_runtime.nsi 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/installer/hdrflow_runtime.nsi 2008-02-24 10:53:28 UTC (rev 424)
@@ -82,6 +82,7 @@
SetOutPath $INSTDIR\DLLs
File "..\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
+ File "..\Multi-threaded Release DLL\*.opl"
; dependencies
File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
Modified: trunk/lib/openlibraries/installer/hdrflow_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_sdk.nsi 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/installer/hdrflow_sdk.nsi 2008-02-24 10:53:28 UTC (rev 424)
@@ -145,6 +145,7 @@
SetOutPath $INSTDIR\DLLs
File "..\Multi-threaded Debug DLL\*-vc80-d-${VERSION}.dll"
+ File "..\Multi-threaded Debug DLL\*.opl"
File "..\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
; dependencies
@@ -221,8 +222,8 @@
;Registry
WriteRegStr HKLM "Software\HDRFlow" "CurrentVersion" "${VERSION_DOT}"
-WriteRegStr HKLM "Software\HDRFlow" "PluginsDirDebug" "$INSTDIR\plugins\DLLs"
-WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease" "$INSTDIR\plugins\DLLs"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirDebug" "$INSTDIR\DLLs"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease" "$INSTDIR\DLLs"
WriteRegStr HKLM "Software\HDRFlow" "KernelsDir" "$INSTDIR\kernels"
WriteRegStr HKLM "Software\HDRFlow" "ShadersDir" "$INSTDIR\shaders"
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -97,6 +97,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -183,6 +184,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -99,6 +99,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -186,6 +187,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -96,6 +96,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -179,6 +180,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -98,6 +98,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -184,6 +185,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -98,6 +98,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -184,6 +185,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -101,6 +101,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -188,6 +189,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -99,6 +99,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -187,6 +188,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -99,6 +99,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -186,6 +187,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -98,6 +98,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -184,6 +185,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -99,6 +99,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -186,6 +187,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -97,6 +97,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -183,6 +184,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -98,6 +98,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -184,6 +185,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -97,6 +97,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -182,6 +183,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -96,6 +96,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -180,6 +181,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -98,6 +98,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -183,6 +184,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2008-02-23 20:42:50 UTC (rev 423)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2008-02-24 10:53:28 UTC (rev 424)
@@ -98,6 +98,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -183,6 +184,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2008-04-22 19:32:08
|
Revision: 441
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=441&view=rev
Author: glslang
Date: 2008-04-22 12:32:03 -0700 (Tue, 22 Apr 2008)
Log Message:
-----------
Leopard portability fixes
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/src/openimagelib/plugins/Makefile.am
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2008-03-31 21:10:39 UTC (rev 440)
+++ trunk/lib/openlibraries/configure.ac 2008-04-22 19:32:03 UTC (rev 441)
@@ -96,10 +96,16 @@
AC_CHECK_SQLITE3( )
dnl check for X11
-AC_PATH_XTRA
-if test x"$no_x" != "xyes"; then
- AC_DEFINE(HAVE_X11,1,[Define this if you have X11R6 installed])
-fi
+case $host in
+ *-apple-darwin*)
+ ;;
+ *)
+ AC_PATH_XTRA
+ if test x"$no_x" != "xyes"; then
+ AC_DEFINE(HAVE_X11,1,[Define this if you have X11R6 installed])
+ fi
+ ;;
+esac
AM_CONDITIONAL(HAVE_X11, [test x"$no_x" != "xyes"])
dnl OpenGL, GLU, GLUT support
@@ -125,11 +131,11 @@
dnl GLEW support
AC_CHECK_GLEW( )
-dnl NVIDIA Cg runtime support
-AC_CHECK_CG_RUNTIME( )
+#dnl NVIDIA Cg runtime support
+#AC_CHECK_CG_RUNTIME( )
-dnl NVIDIA Gelato(tm) runtime support
-AC_CHECK_GELATO_RUNTIME( )
+#dnl NVIDIA Gelato(tm) runtime support
+#AC_CHECK_GELATO_RUNTIME( )
dnl OFX support
AC_CHECK_OFX( )
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/Makefile.am 2008-03-31 21:10:39 UTC (rev 440)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/Makefile.am 2008-04-22 19:32:03 UTC (rev 441)
@@ -10,7 +10,6 @@
exr \
hdr \
jpg \
- png \
sgi \
tga \
tiff \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X