Navigation

← Previous Changeset
Next Changeset →

Changeset 16

Timestamp:

08/05/08 13:17:49 (1 year ago)

Author:

callum.linden

Message:

Some misc fixes: Fixed up VC8 solution/project files, added VC8 release and debug versions of GLUI library, fixed testGL dependency, fixed uninitialized HWND in llembeddedbrowserwindow.cpp.
Reviewed by telephone

Files:

trunk/llmozlib2/llembeddedbrowserwindow.cpp (modified) (1 diff)
trunk/llmozlib2/llmozlib2.sln (modified) (2 diffs)
trunk/llmozlib2/llmozlib2_vc8.sln (modified) (1 diff)
trunk/llmozlib2/tests/dependencies/lib/glui32-vc8.lib (added)
trunk/llmozlib2/tests/dependencies/lib/glui32d-vc8.lib (added)
trunk/llmozlib2/tests/testgl/testgl_vc8.vcproj (modified) (2 diffs)
trunk/llmozlib2/tests/ubrowser/ubrowser_vc8.vcproj (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/llmozlib2/llembeddedbrowserwindow.cpp

r15	r16
1341	1341
1342	1342	HWND nativeWidget = (HWND)aWidget->GetNativeData( NS_NATIVE_WIDGET );
1343		HWND nativeWidgetChild;
	1343	HWND nativeWidgetChild = 0;
1344	1344	while ( ::GetParent( nativeWidget ) )
1345	1345	{

trunk/llmozlib2/llmozlib2.sln

r9	r16
11	11	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgl", "tests\testgl\testgl.vcproj", "{2BB0EAD3-E37A-4FC8-AFC3-F9580C7587A5}"
12	12	ProjectSection(ProjectDependencies) = postProject
	13	{23504F1F-3A7E-4E11-8D8F-4C4B8BF89000} = {23504F1F-3A7E-4E11-8D8F-4C4B8BF89000}
13	14	EndProjectSection
14	15	EndProject
…	…
17	18	Debug = Debug
18	19	Release = Release
	20	EndGlobalSection
	21	GlobalSection(ProjectDependencies) = postSolution
19	22	EndGlobalSection
20	23	GlobalSection(ProjectConfiguration) = postSolution

trunk/llmozlib2/llmozlib2_vc8.sln

r9	r16
9	9	EndProject
10	10	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgl", "tests\testgl\testgl_vc8.vcproj", "{2BB0EAD3-E37A-4FC8-AFC3-F9580C7587A5}"
	11	ProjectSection(ProjectDependencies) = postProject
	12	{23504F1F-3A7E-4E11-8D8F-4C4B8BF89000} = {23504F1F-3A7E-4E11-8D8F-4C4B8BF89000}
	13	EndProjectSection
11	14	EndProject
12	15	Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{73C2BAC3-26CB-433E-9218-6CB4A0B1C69E}"

trunk/llmozlib2/tests/testgl/testgl_vc8.vcproj

r9	r16
63	63	<Tool
64	64	Name="VCLinkerTool"
65		AdditionalDependencies="opengl32.lib glu32.lib version.lib comctl32.lib llmozlib2d.lib"
	65	AdditionalDependencies="opengl32.lib glu32.lib version.lib comctl32.lib llmozlib2d-vc80.lib"
66	66	OutputFile="$(OutDir)/testgl.exe"
67	67	LinkIncremental="2"
…	…
146	146	Name="VCLinkerTool"
147	147	IgnoreImportLibrary="false"
148		AdditionalDependencies="opengl32.lib glu32.lib version.lib comctl32.lib llmozlib2.lib glui32.lib"
	148	AdditionalDependencies="opengl32.lib glu32.lib version.lib comctl32.lib llmozlib2-vc80.lib glui32.lib"
149	149	OutputFile="$(OutDir)/testgl.exe"
150	150	LinkIncremental="1"

trunk/llmozlib2/tests/ubrowser/ubrowser_vc8.vcproj

r9	r16
63	63	<Tool
64	64	Name="VCLinkerTool"
65		AdditionalDependencies="opengl32.lib glu32.lib version.lib comctl32.lib llmozlib2d.lib"
	65	AdditionalDependencies="opengl32.lib glu32.lib version.lib comctl32.lib llmozlib2d-vc80.lib glui32d-vc8.lib"
66	66	OutputFile="$(OutDir)/ubrowser.exe"
67	67	LinkIncremental="2"
…	…
146	146	Name="VCLinkerTool"
147	147	IgnoreImportLibrary="false"
148		AdditionalDependencies="opengl32.lib glu32.lib version.lib comctl32.lib ~~glui32.lib llmozlib2~~.lib"
	148	AdditionalDependencies="opengl32.lib glu32.lib version.lib comctl32.lib llmozlib2-vc80.lib glui32-vc8.lib"
149	149	OutputFile="$(OutDir)/ubrowser.exe"
150	150	LinkIncremental="1"