Navigation

← Previous Changeset
Next Changeset →

Changeset 198

Timestamp:

02/28/08 10:47:26 (4 months ago)

Author:

timo

Message:

towards compiling on windows again

Files:

GtkRadiant/branches/ZeroRadiant/radiant.sln (modified) (6 diffs)
GtkRadiant/branches/ZeroRadiant/radiant/missing.cpp (modified) (1 diff)
GtkRadiant/branches/ZeroRadiant/tools/quake3/q3map2/q3map2.h (modified) (1 diff)
GtkRadiant/branches/ZeroRadiant/tools/quake3/q3map2/q3map2.vcproj (modified) (3 diffs)

Legend:

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

GtkRadiant/branches/ZeroRadiant/radiant.sln

r191	r198
4	4	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "radiant", "radiant\radiant.vcproj", "{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}"
5	5	ProjectSection(ProjectDependencies) = postProject
	6	{320CF5DE-0DFD-4C3F-B558-5F4098E111C8} = {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}
	7	{E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
	8	{5DCC8086-830E-42E6-B080-5A287F8FF5DC} = {5DCC8086-830E-42E6-B080-5A287F8FF5DC}
	9	{DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} = {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}
	10	{0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756}
6	11	{3886C418-A41E-4AFF-BBD1-8E1E508920C9} = {3886C418-A41E-4AFF-BBD1-8E1E508920C9}
7		~~{0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756}~~
8		~~{DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} = {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}~~
9		~~{5DCC8086-830E-42E6-B080-5A287F8FF5DC} = {5DCC8086-830E-42E6-B080-5A287F8FF5DC}~~
10		~~{B1684CA7-AB7C-46A8-92A0-D621406FE041} = {B1684CA7-AB7C-46A8-92A0-D621406FE041}~~
11		~~{E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}~~
12		~~{320CF5DE-0DFD-4C3F-B558-5F4098E111C8} = {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}~~
13	12	EndProjectSection
14	13	EndProject
…	…
18	17	EndProject
19	18	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ddslib", "libs\ddslib\ddslib.vcproj", "{5DCC8086-830E-42E6-B080-5A287F8FF5DC}"
20		~~EndProject~~
21		~~Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg6", "libs\jpeg6\jpeg6.vcproj", "{B1684CA7-AB7C-46A8-92A0-D621406FE041}"~~
22	19	EndProject
23	20	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "l_net", "libs\l_net\l_net.vcproj", "{3886C418-A41E-4AFF-BBD1-8E1E508920C9}"
…	…
31	28	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "camera", "contrib\camera\camera.vcproj", "{A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}"
32	29	ProjectSection(ProjectDependencies) = postProject
	30	{6C1116CE-D99E-4629-9E69-A9329335D706} = {6C1116CE-D99E-4629-9E69-A9329335D706}
33	31	{E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
34		~~{6C1116CE-D99E-4629-9E69-A9329335D706} = {6C1116CE-D99E-4629-9E69-A9329335D706}~~
35	32	EndProjectSection
36	33	EndProject
37	34	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "entity", "plugins\entity\entity.vcproj", "{17DD38AA-4842-45BC-9304-2ADC1A12B4F4}"
38	35	ProjectSection(ProjectDependencies) = postProject
	36	{E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
39	37	{320CF5DE-0DFD-4C3F-B558-5F4098E111C8} = {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}
40		~~{E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}~~
41	38	EndProjectSection
42	39	EndProject
…	…
51	48	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "model", "plugins\model\model.vcproj", "{83C877DA-17B2-4863-B085-06AE9A8D68F3}"
52	49	ProjectSection(ProjectDependencies) = postProject
	50	{320CF5DE-0DFD-4C3F-B558-5F4098E111C8} = {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}
	51	{444E6FDA-83BD-49F1-89A4-7CF716F742A8} = {444E6FDA-83BD-49F1-89A4-7CF716F742A8}
53	52	{E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
54		~~{444E6FDA-83BD-49F1-89A4-7CF716F742A8} = {444E6FDA-83BD-49F1-89A4-7CF716F742A8}~~
55		~~{320CF5DE-0DFD-4C3F-B558-5F4098E111C8} = {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}~~
56	53	EndProjectSection
57	54	EndProject
…	…
75	72	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3map2\q3map2.vcproj", "{F5D0509C-80E0-49B7-B033-885D8253063A}"
76	73	ProjectSection(ProjectDependencies) = postProject
77		{~~B1684CA7-AB7C-46A8-92A0-D621406FE041} = {B1684CA7-AB7C-46A8-92A0-D621406FE04~~1}
	74	{DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} = {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}
78	75	EndProjectSection
79	76	EndProject
…	…
100	97	{5DCC8086-830E-42E6-B080-5A287F8FF5DC}.Release\|Win32.ActiveCfg = Release\|Win32
101	98	{5DCC8086-830E-42E6-B080-5A287F8FF5DC}.Release\|Win32.Build.0 = Release\|Win32
102		~~{B1684CA7-AB7C-46A8-92A0-D621406FE041}.Debug\|Win32.ActiveCfg = Debug\|Win32~~
103		~~{B1684CA7-AB7C-46A8-92A0-D621406FE041}.Debug\|Win32.Build.0 = Debug\|Win32~~
104		~~{B1684CA7-AB7C-46A8-92A0-D621406FE041}.Release\|Win32.ActiveCfg = Release\|Win32~~
105		~~{B1684CA7-AB7C-46A8-92A0-D621406FE041}.Release\|Win32.Build.0 = Release\|Win32~~
106	99	{3886C418-A41E-4AFF-BBD1-8E1E508920C9}.Debug\|Win32.ActiveCfg = Debug\|Win32
107	100	{3886C418-A41E-4AFF-BBD1-8E1E508920C9}.Debug\|Win32.Build.0 = Debug\|Win32

GtkRadiant/branches/ZeroRadiant/radiant/missing.cpp

r197 r198

35 35 //
36 36
37 // FIXME: compile on Windows as well
37 38 #if defined (__linux__) || defined (__APPLE__)
38 39
GtkRadiant/branches/ZeroRadiant/tools/quake3/q3map2/q3map2.h

r193 r198

79 79 #include "vfs.h"
80 80 #include "png.h"
81 ~~#include <jpeglib.h>~~
82 ~~#include <jerror.h>~~
83 81
84 82 #include <stdlib.h>

GtkRadiant/branches/ZeroRadiant/tools/quake3/q3map2/q3map2.vcproj

r177	r198
61	61	<Tool
62	62	Name="VCLinkerTool"
63		AdditionalDependencies="md5lib.lib ddslib.lib l_net.lib mathlib.lib picomodel.lib ~~jpeg6.lib libxml2.lib libpng.lib glib-2.0.lib gobject-2.0.lib Wsock32~~.lib"
64		AdditionalLibraryDirectories=""$(SolutionDir)\..\libxml2\lib";"$(SolutionDir)\..\gtk2\lib";"$(SolutionDir)\build\$(ConfigurationName)\libs""
	63	AdditionalDependencies="md5lib.lib ddslib.lib l_net.lib mathlib.lib picomodel.lib libxml2.lib libpng.lib glib-2.0.lib gobject-2.0.lib Wsock32.lib libjpeg.lib"
	64	AdditionalLibraryDirectories=""$(SolutionDir)\..\libxml2\lib";"$(SolutionDir)\..\gtk2\lib";"$(SolutionDir)\build\$(ConfigurationName)\libs";"$(SolutionDir)\..\jpeg-6b""
65	65	GenerateDebugInformation="true"
66	66	TargetMachine="1"
…	…
135	135	<Tool
136	136	Name="VCLinkerTool"
137		AdditionalDependencies="md5lib.lib ddslib.lib l_net.lib mathlib.lib picomodel.lib ~~jpeg6.lib libxml2.lib libpng.lib glib-2.0.lib gobject-2.0.lib Wsock32~~.lib"
138		AdditionalLibraryDirectories=""$(SolutionDir)\..\libxml2\lib";"$(SolutionDir)\..\gtk2\lib";"$(SolutionDir)\build\$(ConfigurationName)\libs""
	137	AdditionalDependencies="md5lib.lib ddslib.lib l_net.lib mathlib.lib picomodel.lib libxml2.lib libpng.lib glib-2.0.lib gobject-2.0.lib Wsock32.lib libjpeg.lib"
	138	AdditionalLibraryDirectories=""$(SolutionDir)\..\libxml2\lib";"$(SolutionDir)\..\gtk2\lib";"$(SolutionDir)\build\$(ConfigurationName)\libs";"$(SolutionDir)\..\jpeg-6b""
139	139	GenerateDebugInformation="true"
140	140	OptimizeReferences="2"
…	…
230	230	RelativePath="..\common\inout.c"
231	231	>
	232	</File>
	233	<File
	234	RelativePath="..\common\jpeg.c"
	235	>
	236	<FileConfiguration
	237	Name="Debug\|Win32"
	238	>
	239	<Tool
	240	Name="VCCLCompilerTool"
	241	AdditionalIncludeDirectories=""$(SolutionDir)\..\jpeg-6b""
	242	/>
	243	</FileConfiguration>
	244	<FileConfiguration
	245	Name="Release\|Win32"
	246	>
	247	<Tool
	248	Name="VCCLCompilerTool"
	249	AdditionalIncludeDirectories=""$(SolutionDir)\..\jpeg-6b""
	250	/>
	251	</FileConfiguration>
232	252	</File>
233	253	<File

r197	r198
35	35	//
36	36
	37	// FIXME: compile on Windows as well
37	38	#if defined (__linux__) \|\| defined (__APPLE__)
38	39

r193	r198
79	79	#include "vfs.h"
80	80	#include "png.h"
81		~~#include <jpeglib.h>~~
82		~~#include <jerror.h>~~
83	81
84	82	#include <stdlib.h>

Navigation

Changeset 198

Legend:

GtkRadiant/branches/ZeroRadiant/radiant.sln

GtkRadiant/branches/ZeroRadiant/radiant/missing.cpp

GtkRadiant/branches/ZeroRadiant/tools/quake3/q3map2/q3map2.h

GtkRadiant/branches/ZeroRadiant/tools/quake3/q3map2/q3map2.vcproj

Download in other formats: