From 9ef80305de4eee98ad58bad0af9f35e71d3d475e Mon Sep 17 00:00:00 2001
From: rambetter
Date: Thu, 24 Feb 2011 03:53:03 +0000
Subject: [PATCH 02/19] The release config for radiant target was busted on
Linux in SCons build. Problem was that the compile flags were overly
aggressive and caused segfaults. They included: -O3 -Winline -ffast-math
-fno-unsafe-math-optimizations -fno-strict-aliasing Changed to: -O2
-fno-strict-aliasing From my experience, -O3 is usually a bad idea.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@476 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
config.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.py b/config.py
index 07b6483e..ae94c878 100644
--- a/config.py
+++ b/config.py
@@ -246,8 +246,8 @@ class Config:
env.Append( CXXFLAGS = [ '-g' ] )
env.Append( CPPDEFINES = [ '_DEBUG' ] )
else:
- env.Append( CFLAGS = [ '-O3', '-Winline', '-ffast-math', '-fno-unsafe-math-optimizations', '-fno-strict-aliasing' ] )
- env.Append( CXXFLAGS = [ '-O3', '-Winline', '-ffast-math', '-fno-unsafe-math-optimizations','-fno-strict-aliasing' ] )
+ env.Append( CFLAGS = [ '-O2', '-fno-strict-aliasing' ] )
+ env.Append( CXXFLAGS = [ '-O2', '-fno-strict-aliasing' ] )
def CheckoutOrUpdate( self, svnurl, path ):
if ( os.path.exists( path ) ):
From 69fb7e4ba4c3c59e019504778e719ffbdd1f091d Mon Sep 17 00:00:00 2001
From: rambetter
Date: Thu, 24 Feb 2011 04:14:47 +0000
Subject: [PATCH 03/19] Updating Windows compile guide after the major overhaul
of Windows build system.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@477 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
windows_compile_guide/index.html | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/windows_compile_guide/index.html b/windows_compile_guide/index.html
index 54cb9c1f..ece766a9 100644
--- a/windows_compile_guide/index.html
+++ b/windows_compile_guide/index.html
@@ -290,7 +290,7 @@ $ scons target=setup
Start Microsoft Visual C++. From the "File" menu, choose "Open" -> "Project/Solution...".
Navigate to your GtkRadiant directory (in my case C:\MinGW\msys\1.0\home\rambetter\radiant-work\GtkRadiant).
- Choose the project file radiant_VC9.sln from this directory.
+ Choose the project file radiant.sln from this directory.
You now have the GtkRadiant project loaded in Visual C++. You can poke around if you like, e.g. open up some source code
@@ -307,13 +307,13 @@ $ scons target=setup
To build GtkRadiant, choose "Build Solution" from the "Build" menu. The build will take
- about 5 minutes [on a Pentium 4 with HTT], so this would be a good time to go get coffee.
+ about 10 minutes [on a Pentium 4 with HTT], so this would be a good time to go get a cup of tea.
If the build completes successfully, you will get a message similar to the following in the output
of Visual C++:
- radiant - 0 error(s), 1 warning(s)
-========== Build: 20 succeeded, 0 failed, 0 up-to-date, 0 skipped ==========
+ radiant - 0 error(s), 0 warning(s)
+========== Build: 37 succeeded, 0 failed, 0 up-to-date, 0 skipped ==========
From caadbd4cfc7aad3ac87651d06f954829de12d94a Mon Sep 17 00:00:00 2001
From: rambetter
Date: Sat, 26 Feb 2011 00:41:18 +0000
Subject: [PATCH 04/19] Adding patch_seam q3map2 regression test. Probably not
fixable, but good to note.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@478 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
regression_tests/q3map2/patch_seam/README.txt | 8 ++
.../q3map2/patch_seam/maps/patch_seam.map | 96 ++++++++++++++++++
.../radiant_regression_tests/green.tga | Bin 0 -> 300 bytes
.../radiant_regression_tests/tile.tga | Bin 0 -> 812 bytes
4 files changed, 104 insertions(+)
create mode 100644 regression_tests/q3map2/patch_seam/README.txt
create mode 100644 regression_tests/q3map2/patch_seam/maps/patch_seam.map
create mode 100644 regression_tests/q3map2/patch_seam/textures/radiant_regression_tests/green.tga
create mode 100644 regression_tests/q3map2/patch_seam/textures/radiant_regression_tests/tile.tga
diff --git a/regression_tests/q3map2/patch_seam/README.txt b/regression_tests/q3map2/patch_seam/README.txt
new file mode 100644
index 00000000..b40bb602
--- /dev/null
+++ b/regression_tests/q3map2/patch_seam/README.txt
@@ -0,0 +1,8 @@
+DESCRIPTION OF PROBLEM:
+=======================
+
+The seam where the two patches meet has holes. This is because the
+triangulations of the two patch meshes don't match.
+
+It may or may not be possible to adjust the process of compiling patch mesh
+to make good seams more probable. Investigate.
diff --git a/regression_tests/q3map2/patch_seam/maps/patch_seam.map b/regression_tests/q3map2/patch_seam/maps/patch_seam.map
new file mode 100644
index 00000000..a6d0eb25
--- /dev/null
+++ b/regression_tests/q3map2/patch_seam/maps/patch_seam.map
@@ -0,0 +1,96 @@
+// entity 0
+{
+"classname" "worldspawn"
+// brush 0
+{
+patchDef2
+{
+radiant_regression_tests/green
+( 3 3 0 0 0 )
+(
+( ( -512 2368 -1088 -16 -74 ) ( -512 1984 -1088 -16 -62 ) ( -512 1856 -1056 -16 -58 ) )
+( ( -592 2368 -1088 -18.500000 -74 ) ( -592 1984 -1088 -18.500000 -62 ) ( -592 1856 -1064 -18.500000 -58 ) )
+( ( -704 2368 -1088 -22 -74 ) ( -704 1984 -1088 -22 -62 ) ( -704 1856 -1064 -22 -58 ) )
+)
+}
+}
+// brush 1
+{
+patchDef2
+{
+radiant_regression_tests/green
+( 3 3 0 0 0 )
+(
+( ( -704 1792 -1020 -22 -56 ) ( -704 1824 -1058 -22 -57 ) ( -704 1856 -1064 -22 -58 ) )
+( ( -616 1792 -1020 -19.250000 -56 ) ( -616 1824 -1058 -19.250000 -57 ) ( -592 1856 -1064 -18.500000 -58 ) )
+( ( -512 1792 -1008 -16 -56 ) ( -512 1824 -1048 -16 -57 ) ( -512 1856 -1056 -16 -58 ) )
+)
+}
+}
+// brush 2
+{
+( -448 2496 -1160 ) ( -768 2496 -1160 ) ( -768 1984 -1160 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -768 1856 -1152 ) ( -768 2368 -1152 ) ( -448 2368 -1152 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
+( -768 1728 -1152 ) ( -448 1728 -1152 ) ( -448 1728 -1168 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -448 1856 -1152 ) ( -448 2368 -1152 ) ( -448 2368 -1168 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -448 2496 -1152 ) ( -768 2496 -1152 ) ( -768 2496 -1168 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -768 2368 -1152 ) ( -768 1856 -1152 ) ( -768 1856 -1168 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+}
+// brush 3
+{
+( -768 2496 -1152 ) ( -824 2496 -1152 ) ( -824 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -824 1728 -768 ) ( -824 2496 -768 ) ( -768 2496 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -824 1728 -768 ) ( -768 1728 -768 ) ( -768 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -768 1728 -768 ) ( -768 2496 -768 ) ( -768 2496 -1152 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
+( -768 2496 -768 ) ( -824 2496 -768 ) ( -824 2496 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -776 2496 -768 ) ( -776 1728 -768 ) ( -776 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+}
+// brush 4
+{
+( -320 2496 -1152 ) ( -448 2496 -1152 ) ( -448 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -448 1728 -768 ) ( -448 2496 -768 ) ( -320 2496 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -448 1728 -768 ) ( -320 1728 -768 ) ( -320 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -440 1728 -752 ) ( -440 2496 -752 ) ( -440 2496 -1136 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -320 2496 -768 ) ( -448 2496 -768 ) ( -448 2496 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -448 2496 -768 ) ( -448 1728 -768 ) ( -448 1728 -1152 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
+}
+// brush 5
+{
+( -448 2496 -768 ) ( -768 2496 -768 ) ( -768 1728 -768 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
+( -752 1728 -760 ) ( -752 2496 -760 ) ( -432 2496 -760 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -768 1728 -704 ) ( -448 1728 -704 ) ( -448 1728 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -448 1728 -704 ) ( -448 2496 -704 ) ( -448 2496 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -448 2496 -704 ) ( -768 2496 -704 ) ( -768 2496 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -768 2496 -704 ) ( -768 1728 -704 ) ( -768 1728 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+}
+// brush 6
+{
+( -448 2552 -1152 ) ( -768 2552 -1152 ) ( -768 2496 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -768 2496 -768 ) ( -768 2552 -768 ) ( -448 2552 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -768 2496 -768 ) ( -448 2496 -768 ) ( -448 2496 -1160 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
+( -448 2496 -768 ) ( -448 2552 -768 ) ( -448 2552 -1160 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -448 2504 -760 ) ( -768 2504 -760 ) ( -768 2504 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -768 2552 -768 ) ( -768 2496 -768 ) ( -768 2496 -1160 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+}
+// brush 7
+{
+( -448 1728 -1152 ) ( -768 1728 -1152 ) ( -768 1656 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -768 1656 -768 ) ( -768 1728 -768 ) ( -448 1728 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -768 1720 -752 ) ( -448 1720 -752 ) ( -448 1720 -1136 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -448 1656 -768 ) ( -448 1728 -768 ) ( -448 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+( -448 1728 -768 ) ( -768 1728 -768 ) ( -768 1728 -1152 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
+( -768 1728 -768 ) ( -768 1656 -768 ) ( -768 1656 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
+}
+}
+// entity 1
+{
+"angle" "270"
+"origin" "-608 2048 -976"
+"classname" "info_player_deathmatch"
+}
+// entity 2
+{
+"light" "1000"
+"origin" "-608 1944 -872"
+"classname" "light"
+}
diff --git a/regression_tests/q3map2/patch_seam/textures/radiant_regression_tests/green.tga b/regression_tests/q3map2/patch_seam/textures/radiant_regression_tests/green.tga
new file mode 100644
index 0000000000000000000000000000000000000000..8f6d3a49fd54a0c27e7eda57eb16f178a81cd03c
GIT binary patch
literal 300
scmZQz;9`IQ2L=ZQ35NX)|3@^2g+@qFsB4&Ku&2MDZiJhskE
Date: Thu, 3 Mar 2011 15:51:44 +0000
Subject: [PATCH 05/19] - Updated Windows build doc, very slight revision.
Changed 37 targets to 38. - Added plugins/imagehl to list of modules built
(both Windows and Linux). Not really sure what this does, but it's
the only module (as defined by stuff in plugins/ or contrib/) that exists
and isn't currently part of the build. - The code to disable desktop
composition in Windows has been moved from start of main() to an option
in Preferences. The pref reads as follows: "NVIDIA/Aero bug - disable
Windows composition". It is enabled by default. - Color themes controlled by
"Misc" -> "Colors" -> "Themes" options are now saved as soon as you
select them. The color theme is no longer clobbered when opening
Preferences. - The ATI broken driver (bug #802) pref has been reworded since
it applies to Intel cards as well. Before: "ATI cards with broken
drivers - bug #802". After: "ATI and Intel cards w/ buggy drivers
(disappearing polygons)".
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@479 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
config.py | 1 +
plugins/imagehl/imagehl.def | 1 -
plugins/imagehl/imagehl.vcproj | 189 +++++++++++++++++++++
plugins/imagehl/imagehl.vcproj.out-of-date | 75 --------
radiant.sln | 9 +
radiant/main.cpp | 26 ---
radiant/mainframe.cpp | 4 +
radiant/preferences.cpp | 81 ++++++++-
radiant/preferences.h | 15 +-
windows_compile_guide/index.html | 2 +-
10 files changed, 290 insertions(+), 113 deletions(-)
create mode 100644 plugins/imagehl/imagehl.vcproj
delete mode 100644 plugins/imagehl/imagehl.vcproj.out-of-date
diff --git a/config.py b/config.py
index ae94c878..fa042a7e 100644
--- a/config.py
+++ b/config.py
@@ -105,6 +105,7 @@ class Config:
'plugins/model/model.vcproj',
'plugins/imagepng/imagepng.vcproj',
'plugins/imagewal/imagewal.vcproj',
+ 'plugins/imagehl/imagehl.vcproj',
'plugins/imagem8/imagem8.vcproj',
'plugins/spritemodel/spritemodel.vcproj',
'plugins/textool/textool.vcproj',
diff --git a/plugins/imagehl/imagehl.def b/plugins/imagehl/imagehl.def
index 0e4eb081..518667f3 100644
--- a/plugins/imagehl/imagehl.def
+++ b/plugins/imagehl/imagehl.def
@@ -1,7 +1,6 @@
; hlimage.def : Declares the module parameters for the DLL.
LIBRARY "ImageHL"
-DESCRIPTION 'ImageHL Windows Dynamic Link Library'
EXPORTS
; Explicit exports can go here
diff --git a/plugins/imagehl/imagehl.vcproj b/plugins/imagehl/imagehl.vcproj
new file mode 100644
index 00000000..e30ec135
--- /dev/null
+++ b/plugins/imagehl/imagehl.vcproj
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/imagehl/imagehl.vcproj.out-of-date b/plugins/imagehl/imagehl.vcproj.out-of-date
deleted file mode 100644
index 82301e06..00000000
--- a/plugins/imagehl/imagehl.vcproj.out-of-date
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/radiant.sln b/radiant.sln
index 9561a1db..430e2bd5 100644
--- a/radiant.sln
+++ b/radiant.sln
@@ -112,6 +112,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagewal", "plugins\imagewa
{E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagehl", "plugins\imagehl\imagehl.vcproj", "{BA1BC409-744B-4270-8E47-BA10872313AD}"
+ ProjectSection(ProjectDependencies) = postProject
+ {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+ EndProjectSection
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagem8", "plugins\imagem8\imagem8.vcproj", "{C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}"
ProjectSection(ProjectDependencies) = postProject
{E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
@@ -274,6 +279,10 @@ Global
{8D3160AB-B386-4970-8146-826BC293CCB1}.Debug|Win32.Build.0 = Debug|Win32
{8D3160AB-B386-4970-8146-826BC293CCB1}.Release|Win32.ActiveCfg = Release|Win32
{8D3160AB-B386-4970-8146-826BC293CCB1}.Release|Win32.Build.0 = Release|Win32
+ {BA1BC409-744B-4270-8E47-BA10872313AD}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BA1BC409-744B-4270-8E47-BA10872313AD}.Debug|Win32.Build.0 = Debug|Win32
+ {BA1BC409-744B-4270-8E47-BA10872313AD}.Release|Win32.ActiveCfg = Release|Win32
+ {BA1BC409-744B-4270-8E47-BA10872313AD}.Release|Win32.Build.0 = Release|Win32
{C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Debug|Win32.ActiveCfg = Debug|Win32
{C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Debug|Win32.Build.0 = Debug|Win32
{C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/radiant/main.cpp b/radiant/main.cpp
index a6e19296..0d6d5668 100644
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -429,32 +429,6 @@ int main( int argc, char* argv[] ) {
char *libgl, *ptr;
int i, j, k;
- /*
- Rambetter on Fri Jan 21, 2011:
-
- People with recent NVIDIA cards and Windows 7 (Aero) are complaining about "hall of mirrors"
- effect in the OpenGL viewports. The code below is borrowed from NetRadiant to address
- this issue. This change turns off desktop compositing (globally) while Radiant is running.
- It's a real hack but the "correct" fix is very involving, so until the underlying problem
- is addressed we need this code here. I don't know for sure what the underlying problem is,
- but I have a hunch it's the version of gtkglext.dll we're using.
- */
-
-#ifdef _WIN32
- HMODULE lib;
- lib = LoadLibrary("dwmapi.dll");
- if (lib != 0)
- {
- void (WINAPI *qDwmEnableComposition) (bool bEnable) =
- (void (WINAPI *) (bool bEnable)) GetProcAddress(lib, "DwmEnableComposition");
- if (qDwmEnableComposition)
- {
- qDwmEnableComposition(FALSE);
- }
- FreeLibrary(lib);
- }
-#endif
-
/*
Rambetter on Sat Nov 13, 2010:
diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index b3d75c88..5c05dae9 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -5960,6 +5960,7 @@ void MainFrame::OnColorSetoriginal()
g_qeglobals.d_savedinfo.colors[COLOR_SELBRUSHES3D][1] = 0.0f;
g_qeglobals.d_savedinfo.colors[COLOR_SELBRUSHES3D][2] = 0.0f;
+ g_PrefsDlg.SavePrefs();
Sys_UpdateWindows (W_ALL);
}
@@ -6002,6 +6003,7 @@ void MainFrame::OnColorSetqer()
g_qeglobals.d_savedinfo.colors[COLOR_SELBRUSHES3D][1] = 0.0f;
g_qeglobals.d_savedinfo.colors[COLOR_SELBRUSHES3D][2] = 0.0f;
+ g_PrefsDlg.SavePrefs();
Sys_UpdateWindows (W_ALL);
}
@@ -6047,6 +6049,7 @@ void MainFrame::OnColorSetblack()
g_qeglobals.d_savedinfo.colors[COLOR_SELBRUSHES3D][1] = 0.0f;
g_qeglobals.d_savedinfo.colors[COLOR_SELBRUSHES3D][2] = 0.0f;
+ g_PrefsDlg.SavePrefs();
Sys_UpdateWindows (W_ALL);
}
@@ -6090,6 +6093,7 @@ void MainFrame::OnColorSetydnar()
g_qeglobals.d_savedinfo.colors[COLOR_SELBRUSHES3D][1] = 0.0f;
g_qeglobals.d_savedinfo.colors[COLOR_SELBRUSHES3D][2] = 0.0f;
+ g_PrefsDlg.SavePrefs();
Sys_UpdateWindows (W_ALL);
}
diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 3ac20c26..f85075bd 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -148,7 +148,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define TEXTURECOMPRESSIONFORMAT_KEY "TextureCompressionFormat"
#define LIGHTRADIUS_KEY "LightRadiuses"
#define Q3MAP2TEX_KEY "Q3Map2Tex"
+
+#ifdef ATIHACK_812
#define ATIHACK_KEY "ATIHack"
+#endif
+
+#ifdef NVIDIA_AERO_HACK
+#define NVAEROHACK_KEY "NvidiaAeroHack"
+#endif
// window stuff
#define ENTITYSPLIT1_KEY "EntitySplit1"
@@ -687,7 +694,11 @@ PrefsDlg::PrefsDlg ()
m_nLightRadiuses = 1;
m_bQ3Map2Texturing = TRUE;
#ifdef ATIHACK_812
- m_bGlATIHack = FALSE;
+ m_bGlATIHack = FALSE;
+#endif
+#ifdef NVIDIA_AERO_HACK
+ m_bGlNvidiaAeroHack = TRUE;
+ m_bGlNvidiaAeroHackPrevState = -1; // -1 is uninitialized, 0 is FALSE, 1 is TRUE
#endif
}
@@ -1818,11 +1829,18 @@ void PrefsDlg::BuildDialog ()
g_list_free (combo_list);
#ifdef ATIHACK_812
- // ATI bugs
- check = gtk_check_button_new_with_label (_("ATI cards with broken drivers - bug #802"));
- gtk_widget_show(check);
- gtk_box_pack_start(GTK_BOX(vbox), check, FALSE, FALSE, 0);
- AddDialogData(check, &m_bGlATIHack, DLG_CHECK_BOOL);
+ // ATI bugs
+ check = gtk_check_button_new_with_label (_("ATI and Intel cards w/ buggy drivers (disappearing polygons)"));
+ gtk_widget_show(check);
+ gtk_box_pack_start(GTK_BOX(vbox), check, FALSE, FALSE, 0);
+ AddDialogData(check, &m_bGlATIHack, DLG_CHECK_BOOL);
+#endif
+
+#ifdef NVIDIA_AERO_HACK
+ check = gtk_check_button_new_with_label (_("NVIDIA/Aero bug - disable Windows composition"));
+ gtk_widget_show(check);
+ gtk_box_pack_start(GTK_BOX(vbox), check, FALSE, FALSE, 0);
+ AddDialogData(check, &m_bGlNvidiaAeroHack, DLG_CHECK_BOOL);
#endif
// Add the page to the notebook
@@ -2859,6 +2877,40 @@ void PrefsDlg::UpdateATIHack() {
}
#endif
+#ifdef NVIDIA_AERO_HACK
+void PrefsDlg::UpdateNvidiaAeroHack() {
+ if (m_bGlNvidiaAeroHack && m_bGlNvidiaAeroHackPrevState == 1) { return; }
+ if ((!m_bGlNvidiaAeroHack) && m_bGlNvidiaAeroHackPrevState == 0) { return; }
+ if ((!m_bGlNvidiaAeroHack) && m_bGlNvidiaAeroHackPrevState < 0) {
+ // The hack state is uninitialized, meaning that this is the first call
+ // to this function. I prefer not to explicitly enable composition because
+ // the user may have set the application to disable it, and I don't want to
+ // override that. Leave the state of composition as-is if the hack checkbox
+ // isn't checked.
+ m_bGlNvidiaAeroHackPrevState = 0;
+ return;
+ }
+ HMODULE lib = LoadLibrary("dwmapi.dll");
+ if (lib) {
+ void (WINAPI *qDwmEnableComposition) (bool bEnable) =
+ (void (WINAPI *) (bool bEnable)) GetProcAddress(lib, "DwmEnableComposition");
+ if (qDwmEnableComposition) {
+ if (m_bGlNvidiaAeroHack) {
+ Sys_Printf("Disabling Windows composition\n");
+ qDwmEnableComposition(0);
+ m_bGlNvidiaAeroHackPrevState = 1;
+ }
+ else {
+ Sys_Printf("Enabling Windows composition\n");
+ qDwmEnableComposition(1);
+ m_bGlNvidiaAeroHackPrevState = 0;
+ }
+ }
+ FreeLibrary(lib);
+ }
+}
+#endif
+
// TTimo: m_strEnginePath has a special status, if not found in registry we need to
// initiliaze it for sure. It is not totally failsafe but we can use the same
// code than in q3map, expecting to find some "quake" above us. If not, we prompt
@@ -3139,6 +3191,10 @@ void PrefsDlg::LoadPrefs ()
mLocalPrefs.GetPref(ATIHACK_KEY, &m_bGlATIHack, FALSE);
#endif
+#ifdef NVIDIA_AERO_HACK
+ mLocalPrefs.GetPref(NVAEROHACK_KEY, &m_bGlNvidiaAeroHack, TRUE);
+#endif
+
Undo_SetMaxSize(m_nUndoLevels); // set it internally as well / FIXME: why not just have one global value?
UpdateTextureCompression();
@@ -3147,6 +3203,10 @@ void PrefsDlg::LoadPrefs ()
UpdateATIHack();
#endif
+#ifdef NVIDIA_AERO_HACK
+ UpdateNvidiaAeroHack();
+#endif
+
if (mLocalPrefs.mbEmpty)
{
mLocalPrefs.mbEmpty = false;
@@ -3191,9 +3251,12 @@ void PrefsDlg::PostModal (int code)
SavePrefs();
// make sure the logfile is ok
Sys_LogFile();
- #ifdef ATIHACK_812
- UpdateATIHack();
- #endif
+#ifdef ATIHACK_812
+ UpdateATIHack();
+#endif
+#ifdef NVIDIA_AERO_HACK
+ UpdateNvidiaAeroHack();
+#endif
if (g_pParentWnd)
g_pParentWnd->SetGridStatus();
Sys_UpdateWindows(W_ALL);
diff --git a/radiant/preferences.h b/radiant/preferences.h
index 1b2e0469..51c9ccb4 100644
--- a/radiant/preferences.h
+++ b/radiant/preferences.h
@@ -26,6 +26,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "gtkr_list.h"
//#include "profile.h"
+#ifdef _WIN32
+#define NVIDIA_AERO_HACK
+#endif
+
#define MAX_TEXTURE_QUALITY 3
enum PrefTypes_t
@@ -485,6 +489,10 @@ public:
void UpdateATIHack();
#endif
+#ifdef NVIDIA_AERO_HACK
+ void UpdateNvidiaAeroHack();
+#endif
+
void LoadPrefs();
void SavePrefs();
void LoadTexdefPref(texdef_t* pTexdef, char* pName);
@@ -687,7 +695,12 @@ public:
bool m_bQ3Map2Texturing;
#ifdef ATIHACK_812
- bool m_bGlATIHack;
+ bool m_bGlATIHack;
+#endif
+
+#ifdef NVIDIA_AERO_HACK
+ bool m_bGlNvidiaAeroHack;
+ int m_bGlNvidiaAeroHackPrevState;
#endif
void UpdateData (bool retrieve);
diff --git a/windows_compile_guide/index.html b/windows_compile_guide/index.html
index ece766a9..bb850bc3 100644
--- a/windows_compile_guide/index.html
+++ b/windows_compile_guide/index.html
@@ -313,7 +313,7 @@ $ scons target=setup
of Visual C++:
radiant - 0 error(s), 0 warning(s)
-========== Build: 37 succeeded, 0 failed, 0 up-to-date, 0 skipped ==========
+========== Build: 38 succeeded, 0 failed, 0 up-to-date, 0 skipped ==========
From b0978b99cabb1d0165bb7781acd1dae4dda9df2c Mon Sep 17 00:00:00 2001
From: TTimo
Date: Sat, 5 Mar 2011 20:06:42 +0000
Subject: [PATCH 06/19] fix Linux x86_64 compile (Debian Sid, gcc 4.4.5)
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@480 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
SConscript.q3map2 | 2 +-
SConscript.radiant | 1 +
config.py | 6 +++---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/SConscript.q3map2 b/SConscript.q3map2
index 30ba5cbe..82f952b7 100644
--- a/SConscript.q3map2
+++ b/SConscript.q3map2
@@ -10,7 +10,7 @@ Import( [ 'utils', 'config', 'settings', 'lib_objects' ] )
env = Environment()
settings.SetupEnvironment( env, config['name'] )
env.Prepend( CPPPATH = [ '#tools/quake3/common' ] )
-env.Append( LIBS = [ 'pthread', 'png', 'jpeg' ] )
+env.Append( LIBS = [ 'm', 'pthread', 'png', 'jpeg' ] )
proj = utils.vcproj( os.path.join( GetLaunchDir(), 'tools/quake3/q3map2/q3map2.vcproj' ) )
objects = lib_objects
objects += [ os.path.join( 'tools/quake3/q3map2', i ) for i in proj.getSourceFiles() ]
diff --git a/SConscript.radiant b/SConscript.radiant
index f37b0bb7..e2ae082e 100644
--- a/SConscript.radiant
+++ b/SConscript.radiant
@@ -9,6 +9,7 @@ Import( [ 'utils', 'config', 'settings', 'lib_objects' ] )
env = Environment()
settings.SetupEnvironment( env, config[ 'name' ], useGtk = True, useGtkGL = True )
+env.Append( LIBS = [ 'dl' ] )
proj = utils.vcproj( os.path.join( GetLaunchDir(), 'radiant/radiant.vcproj' ) )
radiant = env.Program( 'radiant.bin', lib_objects + [ os.path.join( 'radiant', i ) for i in proj.getSourceFiles() ] )
diff --git a/config.py b/config.py
index fa042a7e..3a517181 100644
--- a/config.py
+++ b/config.py
@@ -76,7 +76,7 @@ class Config:
config['shared'] = False
Export( 'utils', 'settings', 'config' )
build_dir = os.path.join( 'build', config_name, 'radiant' )
- BuildDir( build_dir, '.', duplicate = 0 )
+ VariantDir( build_dir, '.', duplicate = 0 )
lib_objects = []
for project in [ 'libs/synapse/synapse.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj' ]:
Export( 'project' )
@@ -93,7 +93,7 @@ class Config:
config['shared'] = True
Export( 'project', 'config' )
build_dir = os.path.join( 'build', config_name, 'shobjs' )
- BuildDir( build_dir, '.', duplicate = 0 )
+ VariantDir( build_dir, '.', duplicate = 0 )
shlib_objects_extra[libname] = SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
for project in [ 'plugins/vfspk3/vfspk3.vcproj',
@@ -158,7 +158,7 @@ class Config:
config['shared'] = False
Export( 'utils', 'settings', 'config' )
build_dir = os.path.join( 'build', config_name, 'q3map2' )
- BuildDir( build_dir, '.', duplicate = 0 )
+ VariantDir( build_dir, '.', duplicate = 0 )
lib_objects = []
for project in [ 'tools/quake3/common/quake3-common.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib.vcproj' ]:
Export( 'project' )
From 772fdfe0b9140ab81b9a9238f240f65a831bb618 Mon Sep 17 00:00:00 2001
From: TTimo
Date: Sat, 5 Mar 2011 21:08:28 +0000
Subject: [PATCH 07/19] bring the libraries back to id hosting
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@481 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.py b/config.py
index 3a517181..91d0c88a 100644
--- a/config.py
+++ b/config.py
@@ -284,7 +284,7 @@ class Config:
'STLport-5.2.1-4.zip'
]:
if ( not os.path.exists( lib_archive ) ):
- cmd = [ 'wget', '-N', 'http://porky.nerius.com/radiant-libs-win32/%s' % lib_archive ]
+ cmd = [ 'wget', '-N', 'http://zerowing.idsoftware.com/files/radiant/developer/1.6.2/%s' % lib_archive ]
print( repr( cmd ) )
subprocess.check_call( cmd )
lib_archive_path = os.path.abspath( lib_archive )
From a62e98a1f9abc0455f8ce31e1c9245990bc21228 Mon Sep 17 00:00:00 2001
From: rambetter
Date: Sun, 6 Mar 2011 19:14:50 +0000
Subject: [PATCH 08/19] Fixing a Sys_Printf() in main() for "q3map2 -convert".
The usage message was copied from "-scale" and was incorrect. Thanks to
Ensiform from ioquake3 IRC room for reporting this bug.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@482 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
tools/quake3/q3map2/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c
index 86d4d498..045c1c62 100644
--- a/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@ -503,7 +503,7 @@ int ConvertBSPMain( int argc, char **argv )
/* arg checking */
if( argc < 1 )
{
- Sys_Printf( "Usage: q3map -scale [-v] \n" );
+ Sys_Printf( "Usage: q3map -convert [-format ] [-v] \n" );
return 0;
}
From e39f6f4baed522534ad270f01cf2b10a0f70b172 Mon Sep 17 00:00:00 2001
From: rambetter
Date: Wed, 6 Apr 2011 03:56:18 +0000
Subject: [PATCH 09/19] Increasing stack size on Windows build.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@483 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
contrib/bkgrnd2d/bkgrnd2d.vcproj | 2 ++
contrib/bobtoolz/bobtoolz.vcproj | 2 ++
contrib/camera/camera.vcproj | 2 ++
contrib/gtkgensurf/gtkgensurf.vcproj | 2 ++
contrib/hydratoolz/hydratoolz.vcproj | 2 ++
contrib/prtview/prtview.vcproj | 2 ++
contrib/ufoai/ufoai.vcproj | 2 ++
libs/cmdlib/cmdlib.vcproj | 2 ++
libs/ddslib/ddslib.vcproj | 2 ++
libs/l_net/l_net.vcproj | 2 ++
libs/mathlib/mathlib.vcproj | 2 ++
libs/md5lib/md5lib.vcproj | 2 ++
libs/picomodel/picomodel.vcproj | 2 ++
libs/splines/splines.vcproj | 2 ++
libs/synapse/synapse.vcproj | 2 ++
plugins/eclassfgd/fgd.vcproj | 2 ++
plugins/entity/entity.vcproj | 2 ++
plugins/image/image.vcproj | 2 ++
plugins/imagehl/imagehl.vcproj | 2 ++
plugins/imagem8/imagem8.vcproj | 2 ++
plugins/imagepng/imagepng.vcproj | 2 ++
plugins/imagewal/imagewal.vcproj | 2 ++
plugins/map/map.vcproj | 2 ++
plugins/mapxml/mapxml.vcproj | 2 ++
plugins/model/model.vcproj | 2 ++
plugins/shaders/shaders.vcproj | 2 ++
plugins/spritemodel/spritemodel.vcproj | 2 ++
plugins/surface/surface.vcproj | 2 ++
plugins/surface_heretic2/surface_heretic2.vcproj | 2 ++
plugins/surface_quake2/surface_quake2.vcproj | 2 ++
plugins/surface_ufoai/surface_ufoai.vcproj | 2 ++
plugins/textool/textool.vcproj | 2 ++
plugins/vfspak/vfspak.vcproj | 2 ++
plugins/vfspk3/vfspk3.vcproj | 2 ++
plugins/vfswad/vfswad.vcproj | 2 ++
radiant/radiant.vcproj | 2 ++
tools/quake3/common/quake3-common.vcproj | 2 ++
tools/quake3/q3map2/q3map2.vcproj | 2 ++
38 files changed, 76 insertions(+)
diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcproj b/contrib/bkgrnd2d/bkgrnd2d.vcproj
index 07a8a14c..d3722c7d 100644
--- a/contrib/bkgrnd2d/bkgrnd2d.vcproj
+++ b/contrib/bkgrnd2d/bkgrnd2d.vcproj
@@ -38,6 +38,7 @@
/>
Date: Wed, 6 Apr 2011 04:08:22 +0000
Subject: [PATCH 10/19] Backing out commit 483. Going to set linker flags
instead.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@484 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
contrib/bkgrnd2d/bkgrnd2d.vcproj | 2 --
contrib/bobtoolz/bobtoolz.vcproj | 2 --
contrib/camera/camera.vcproj | 2 --
contrib/gtkgensurf/gtkgensurf.vcproj | 2 --
contrib/hydratoolz/hydratoolz.vcproj | 2 --
contrib/prtview/prtview.vcproj | 2 --
contrib/ufoai/ufoai.vcproj | 2 --
libs/cmdlib/cmdlib.vcproj | 2 --
libs/ddslib/ddslib.vcproj | 2 --
libs/l_net/l_net.vcproj | 2 --
libs/mathlib/mathlib.vcproj | 2 --
libs/md5lib/md5lib.vcproj | 2 --
libs/picomodel/picomodel.vcproj | 2 --
libs/splines/splines.vcproj | 2 --
libs/synapse/synapse.vcproj | 2 --
plugins/eclassfgd/fgd.vcproj | 2 --
plugins/entity/entity.vcproj | 2 --
plugins/image/image.vcproj | 2 --
plugins/imagehl/imagehl.vcproj | 2 --
plugins/imagem8/imagem8.vcproj | 2 --
plugins/imagepng/imagepng.vcproj | 2 --
plugins/imagewal/imagewal.vcproj | 2 --
plugins/map/map.vcproj | 2 --
plugins/mapxml/mapxml.vcproj | 2 --
plugins/model/model.vcproj | 2 --
plugins/shaders/shaders.vcproj | 2 --
plugins/spritemodel/spritemodel.vcproj | 2 --
plugins/surface/surface.vcproj | 2 --
plugins/surface_heretic2/surface_heretic2.vcproj | 2 --
plugins/surface_quake2/surface_quake2.vcproj | 2 --
plugins/surface_ufoai/surface_ufoai.vcproj | 2 --
plugins/textool/textool.vcproj | 2 --
plugins/vfspak/vfspak.vcproj | 2 --
plugins/vfspk3/vfspk3.vcproj | 2 --
plugins/vfswad/vfswad.vcproj | 2 --
radiant/radiant.vcproj | 2 --
tools/quake3/common/quake3-common.vcproj | 2 --
tools/quake3/q3map2/q3map2.vcproj | 2 --
38 files changed, 76 deletions(-)
diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcproj b/contrib/bkgrnd2d/bkgrnd2d.vcproj
index d3722c7d..07a8a14c 100644
--- a/contrib/bkgrnd2d/bkgrnd2d.vcproj
+++ b/contrib/bkgrnd2d/bkgrnd2d.vcproj
@@ -38,7 +38,6 @@
/>
Date: Wed, 6 Apr 2011 04:12:34 +0000
Subject: [PATCH 11/19] 8MB stack size linker options on all VC2008 proj files.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@485 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
contrib/bkgrnd2d/bkgrnd2d.vcproj | 2 ++
contrib/bobtoolz/bobtoolz.vcproj | 2 ++
contrib/camera/camera.vcproj | 2 ++
contrib/gtkgensurf/gtkgensurf.vcproj | 2 ++
contrib/hydratoolz/hydratoolz.vcproj | 2 ++
contrib/prtview/prtview.vcproj | 2 ++
contrib/ufoai/ufoai.vcproj | 2 ++
plugins/eclassfgd/fgd.vcproj | 2 ++
plugins/entity/entity.vcproj | 2 ++
plugins/image/image.vcproj | 2 ++
plugins/imagehl/imagehl.vcproj | 2 ++
plugins/imagem8/imagem8.vcproj | 2 ++
plugins/imagepng/imagepng.vcproj | 2 ++
plugins/imagewal/imagewal.vcproj | 2 ++
plugins/map/map.vcproj | 2 ++
plugins/mapxml/mapxml.vcproj | 2 ++
plugins/model/model.vcproj | 2 ++
plugins/shaders/shaders.vcproj | 2 ++
plugins/spritemodel/spritemodel.vcproj | 2 ++
plugins/surface/surface.vcproj | 2 ++
plugins/surface_heretic2/surface_heretic2.vcproj | 2 ++
plugins/surface_quake2/surface_quake2.vcproj | 2 ++
plugins/surface_ufoai/surface_ufoai.vcproj | 2 ++
plugins/textool/textool.vcproj | 2 ++
plugins/vfspak/vfspak.vcproj | 2 ++
plugins/vfspk3/vfspk3.vcproj | 2 ++
plugins/vfswad/vfswad.vcproj | 2 ++
radiant/radiant.vcproj | 2 ++
tools/quake3/q3map2/q3map2.vcproj | 2 ++
29 files changed, 58 insertions(+)
diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcproj b/contrib/bkgrnd2d/bkgrnd2d.vcproj
index 07a8a14c..cdaa3c9f 100644
--- a/contrib/bkgrnd2d/bkgrnd2d.vcproj
+++ b/contrib/bkgrnd2d/bkgrnd2d.vcproj
@@ -60,6 +60,7 @@
/>
Date: Sat, 23 Apr 2011 22:23:31 +0000
Subject: [PATCH 12/19] Removing optimization GCC flags because q3map2 crashes
on Ubuntu 10.10 32 bit, ever since certain updates in that distribution.
This fixes the q3map2 crash, but no more optimizations.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@486 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
config.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/config.py b/config.py
index 91d0c88a..fde0a3c1 100644
--- a/config.py
+++ b/config.py
@@ -247,8 +247,9 @@ class Config:
env.Append( CXXFLAGS = [ '-g' ] )
env.Append( CPPDEFINES = [ '_DEBUG' ] )
else:
- env.Append( CFLAGS = [ '-O2', '-fno-strict-aliasing' ] )
- env.Append( CXXFLAGS = [ '-O2', '-fno-strict-aliasing' ] )
+ # '-O' causes q3map2 errors on Ubuntu 10.10 32 bit.
+ env.Append( CFLAGS = [ ] )
+ env.Append( CXXFLAGS = [ ] )
def CheckoutOrUpdate( self, svnurl, path ):
if ( os.path.exists( path ) ):
From b5b1482c98709bf1f552d3e01781b19d663804c5 Mon Sep 17 00:00:00 2001
From: rambetter
Date: Sun, 1 Jan 2012 21:59:26 +0000
Subject: [PATCH 13/19] Changing the SVN respository of game packs to correct
one after the SVN repo switch.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@487 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.py b/config.py
index fde0a3c1..33a10a78 100644
--- a/config.py
+++ b/config.py
@@ -263,7 +263,7 @@ class Config:
def FetchGamePaks( self, path ):
for pak in self.setup_packs:
if ( pak == 'Q3Pack' or pak == 'UrTPack' or pak == 'UFOAIPack' or pak == 'Q2WPack' or pak == 'ReactionPack' ):
- svnurl = 'https://zerowing.idsoftware.com/svn/radiant.gamepacks/%s/trunk' % pak
+ svnurl = 'svn://svn.icculus.org/gtkradiant-gamepacks/%s/trunk' % pak
self.CheckoutOrUpdate( svnurl, os.path.join( path, 'installs', pak ) )
def Setup( self ):
From 82aeb6acea0adf059c09ab904462bd827fdb742d Mon Sep 17 00:00:00 2001
From: rambetter
Date: Mon, 2 Jan 2012 02:10:52 +0000
Subject: [PATCH 14/19] Updating Windows compile guide with new SVN repo
location.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@488 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
windows_compile_guide/index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/windows_compile_guide/index.html b/windows_compile_guide/index.html
index bb850bc3..8b937065 100644
--- a/windows_compile_guide/index.html
+++ b/windows_compile_guide/index.html
@@ -29,7 +29,7 @@
This guide explains how to compile GtkRadiant 1.6.x from source code on Windows operating systems.
The source code is obtained from
- id Software's official GtkRadiant SVN repository, which is open to the public (details follow).
+ the GtkRadiant SVN repository, which is open to the public (details follow).
These instructions are aimed at developers wanting to test changes to GtkRadiant source code.
The instructions below have been executed successfully on
Windows XP 32 bit (some late service pack) and on Windows 7 Ultimate 32 bit. Since 64 bit systems have not been tested by me, I cannot
@@ -260,7 +260,7 @@ $ ln -s /c/Python27/Scripts/scons /usr/local/bin/scons
Now, we're going to change to that directory and get the base GtkRadiant project:
$ cd radiant-work
-$ svn checkout https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk ./GtkRadiant
+$ svn checkout svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk ./GtkRadiant
We created the extra radiant-work parent directory of GtkRadiant because the following step will
From 493a05caab45742c3ee0bbe61ed68ffa2fb86921 Mon Sep 17 00:00:00 2001
From: rambetter
Date: Mon, 2 Jan 2012 04:48:47 +0000
Subject: [PATCH 15/19] Updating some links in the Windows compile guide.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@489 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
windows_compile_guide/index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/windows_compile_guide/index.html b/windows_compile_guide/index.html
index 8b937065..26fdf57a 100644
--- a/windows_compile_guide/index.html
+++ b/windows_compile_guide/index.html
@@ -62,7 +62,7 @@
Download the mingw-get program. We're going to use mingw-get
as opposed to the graphical installer mingw-get-inst . You can download the most
recent version of mingw-get from
- this SourceForge page.
+ this SourceForge page.
(That page also contains a readme.txt file that has very useful information on how to use
mingw-get , for your reading pleasure.) Download the binary zip file version;
the downloaded file should have a name along the lines of mingw-get-0.1-mingw32-alpha-5-bin.zip .
@@ -230,7 +230,7 @@ $ ln -s /c/Python27/Scripts/scons /usr/local/bin/scons
The GtkRadiant developers are currently using Microsoft Visual C++ 2008 to compile GtkRadiant. Even though Visual C++ 2010 is a newer
version, don't use it [unless you want to be on your own]. You can download Visual C++ 2008 Express Edition from
- this Microsoft webpage.
+ this Microsoft webpage.
When you install Visual C++ 2008 Express Edition, you can install the bare minimum application without any extras such as
From ce733d8b78b5c9bc0a27a5bf9b8f8969e9622b82 Mon Sep 17 00:00:00 2001
From: rambetter
Date: Wed, 4 Jan 2012 00:47:49 +0000
Subject: [PATCH 16/19] Moved windows build paks from Zerowing to icculus.org.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@490 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.py b/config.py
index 33a10a78..f55b7bfa 100644
--- a/config.py
+++ b/config.py
@@ -285,7 +285,7 @@ class Config:
'STLport-5.2.1-4.zip'
]:
if ( not os.path.exists( lib_archive ) ):
- cmd = [ 'wget', '-N', 'http://zerowing.idsoftware.com/files/radiant/developer/1.6.2/%s' % lib_archive ]
+ cmd = [ 'wget', '-N', 'http://icculus.org/gtkradiant/files/1.6.2/%s' % lib_archive ]
print( repr( cmd ) )
subprocess.check_call( cmd )
lib_archive_path = os.path.abspath( lib_archive )
From 75220350bcdbab9b25f7512a7dd3bbc9f0ebf57e Mon Sep 17 00:00:00 2001
From: rambetter
Date: Tue, 14 Feb 2012 18:31:09 +0000
Subject: [PATCH 17/19] Switching order of picoModuleLWO and picoModuleOBJ as a
quick and dirty workaround to problems in libs/picomodel/pm_obj.c which
passes files that aren't Wavefront ASCII.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@491 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
libs/picomodel/picomodules.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/picomodel/picomodules.c b/libs/picomodel/picomodules.c
index add477b5..7a237c1c 100644
--- a/libs/picomodel/picomodules.c
+++ b/libs/picomodel/picomodules.c
@@ -67,8 +67,8 @@ const picoModule_t *picoModules[] =
&picoModuleMDC, /* return to castle wolfenstein mdc */
&picoModuleMD2, /* quake2 md2 */
&picoModuleFM, /* heretic2 fm */
- &picoModuleOBJ, /* wavefront object */
&picoModuleLWO, /* lightwave object */
+ &picoModuleOBJ, /* wavefront object */
NULL /* arnold */
};
From 31c68a8299b4c15abd9e144cba8d63834d4146d3 Mon Sep 17 00:00:00 2001
From: git-svn-migrate
Date: Fri, 16 Mar 2012 22:20:47 -0500
Subject: [PATCH 18/19] Convert svn:ignore properties to .gitignore.
---
.gitignore | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..e92ff2c3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+# /
From 515673c08f8718a237e90c2130a1f5294f966d6a Mon Sep 17 00:00:00 2001
From: Timothee TTimo Besset
Date: Sat, 17 Mar 2012 14:07:19 -0500
Subject: [PATCH 19/19] trash a bunch of outdated and confusing things
---
CHANGES-MACOS | 11 -
COMPILING | 72 -
CONTRIBUTORS | 2 +-
CONTRIBUTOR_AGREEMENT | 0
ChangeLog | 2 -
DarwinCompileInfo.rtf | 55 -
DoxyConfig | 47 -
Doxyfile | 170 -
Doxygen_files/Doxyfile | 159 -
Doxygen_files/doxy_mainpage.h | 45 -
Doxygen_files/doxygen_gtkradiant.css | 34 -
Doxygen_files/doxygen_gtkradiant_foot.html | 49 -
Doxygen_files/doxygen_gtkradiant_head.html | 38 -
Doxygen_files/doxygen_index.html | 7 -
Doxygen_files/doxygen_reference_foot.html | 46 -
Doxygen_files/doxygen_reference_head.html | 38 -
Doxygen_files/example/annotated.html | 103 -
.../example/classIEpair-members.html | 110 -
Doxygen_files/example/classIEpair.html | 414 -
Doxygen_files/example/classes.html | 103 -
Doxygen_files/example/doxygen.gif | Bin 2378 -> 0 bytes
Doxygen_files/example/doxygen_gtkradiant.css | 35 -
Doxygen_files/example/files.html | 102 -
Doxygen_files/example/functions.html | 110 -
Doxygen_files/example/graph_legend.dot | 16 -
Doxygen_files/example/graph_legend.gif | Bin 9344 -> 0 bytes
Doxygen_files/example/graph_legend.html | 141 -
Doxygen_files/example/index.html | 102 -
Doxygen_files/example/pages.html | 104 -
Doxygen_files/example/test_8c-source.html | 140 -
Doxygen_files/example/test_8c.html | 107 -
Doxygen_files/example/todo.html | 105 -
Doxygen_files/genDoxyfile | 159 -
Doxygen_files/gendoxfunctions | 421 -
Doxygen_files/images/body-left-tile.gif | Bin 94 -> 0 bytes
Doxygen_files/images/body-lower-left.gif | Bin 366 -> 0 bytes
Doxygen_files/images/body-lower-right.gif | Bin 352 -> 0 bytes
Doxygen_files/images/body-lower-tile.gif | Bin 67 -> 0 bytes
Doxygen_files/images/body-right-tile.gif | Bin 94 -> 0 bytes
Doxygen_files/images/body-upper-left.gif | Bin 358 -> 0 bytes
Doxygen_files/images/body-upper-right.gif | Bin 362 -> 0 bytes
Doxygen_files/images/body-upper-tile.gif | Bin 92 -> 0 bytes
Doxygen_files/images/gtkr_splash.jpg | Bin 25053 -> 0 bytes
Doxygen_files/images/gtkr_splash_sm.jpg | Bin 7599 -> 0 bytes
Doxygen_files/images/history_id_logo.gif | Bin 1427 -> 0 bytes
Doxygen_files/images/top-right.gif | Bin 606 -> 0 bytes
Doxygen_files/images/top-tile.gif | Bin 122 -> 0 bytes
Doxygen_files/images/top-title.gif | Bin 5356 -> 0 bytes
Doxygen_files/reference1.html | 333 -
GtkRadiant.prj | 688 -
README | 49 -
README.doxygen | 51 -
TODO | 10 -
compile_ibuild_win32.bat | 5 -
gen.readme | 4 -
gendox | 150 -
osx_setup.py | 38 -
radiant.xcode/apple.pbxuser | 496 -
radiant.xcode/project.pbxproj | 95793 ----------------
run_python.bat | 9 -
60 files changed, 1 insertion(+), 100672 deletions(-)
delete mode 100644 CHANGES-MACOS
delete mode 100644 COMPILING
delete mode 100644 CONTRIBUTOR_AGREEMENT
delete mode 100644 ChangeLog
delete mode 100644 DarwinCompileInfo.rtf
delete mode 100644 DoxyConfig
delete mode 100644 Doxyfile
delete mode 100644 Doxygen_files/Doxyfile
delete mode 100644 Doxygen_files/doxy_mainpage.h
delete mode 100644 Doxygen_files/doxygen_gtkradiant.css
delete mode 100644 Doxygen_files/doxygen_gtkradiant_foot.html
delete mode 100644 Doxygen_files/doxygen_gtkradiant_head.html
delete mode 100644 Doxygen_files/doxygen_index.html
delete mode 100644 Doxygen_files/doxygen_reference_foot.html
delete mode 100644 Doxygen_files/doxygen_reference_head.html
delete mode 100644 Doxygen_files/example/annotated.html
delete mode 100644 Doxygen_files/example/classIEpair-members.html
delete mode 100644 Doxygen_files/example/classIEpair.html
delete mode 100644 Doxygen_files/example/classes.html
delete mode 100644 Doxygen_files/example/doxygen.gif
delete mode 100644 Doxygen_files/example/doxygen_gtkradiant.css
delete mode 100644 Doxygen_files/example/files.html
delete mode 100644 Doxygen_files/example/functions.html
delete mode 100644 Doxygen_files/example/graph_legend.dot
delete mode 100644 Doxygen_files/example/graph_legend.gif
delete mode 100644 Doxygen_files/example/graph_legend.html
delete mode 100644 Doxygen_files/example/index.html
delete mode 100644 Doxygen_files/example/pages.html
delete mode 100644 Doxygen_files/example/test_8c-source.html
delete mode 100644 Doxygen_files/example/test_8c.html
delete mode 100644 Doxygen_files/example/todo.html
delete mode 100644 Doxygen_files/genDoxyfile
delete mode 100644 Doxygen_files/gendoxfunctions
delete mode 100644 Doxygen_files/images/body-left-tile.gif
delete mode 100644 Doxygen_files/images/body-lower-left.gif
delete mode 100644 Doxygen_files/images/body-lower-right.gif
delete mode 100644 Doxygen_files/images/body-lower-tile.gif
delete mode 100644 Doxygen_files/images/body-right-tile.gif
delete mode 100644 Doxygen_files/images/body-upper-left.gif
delete mode 100644 Doxygen_files/images/body-upper-right.gif
delete mode 100644 Doxygen_files/images/body-upper-tile.gif
delete mode 100644 Doxygen_files/images/gtkr_splash.jpg
delete mode 100644 Doxygen_files/images/gtkr_splash_sm.jpg
delete mode 100644 Doxygen_files/images/history_id_logo.gif
delete mode 100644 Doxygen_files/images/top-right.gif
delete mode 100644 Doxygen_files/images/top-tile.gif
delete mode 100644 Doxygen_files/images/top-title.gif
delete mode 100644 Doxygen_files/reference1.html
delete mode 100644 GtkRadiant.prj
delete mode 100644 README
delete mode 100644 README.doxygen
delete mode 100644 TODO
delete mode 100644 compile_ibuild_win32.bat
delete mode 100644 gen.readme
delete mode 100644 gendox
delete mode 100644 osx_setup.py
delete mode 100644 radiant.xcode/apple.pbxuser
delete mode 100644 radiant.xcode/project.pbxproj
delete mode 100644 run_python.bat
diff --git a/CHANGES-MACOS b/CHANGES-MACOS
deleted file mode 100644
index 1792be8b..00000000
--- a/CHANGES-MACOS
+++ /dev/null
@@ -1,11 +0,0 @@
-Changes file for the MacOS port of GtkRadiant 1.1-TA
-----------------------------------------------------
-05/24/2001
-TTimo
- Patching the MacOS branch to build on linux
-04/15/2001
-Pradeep
- Changes so that the whole project compiles under MacOSX/XFree.
-03/28/2001
-TTimo
- added this file and gave write access to pradeep on the tree (testing write access)
diff --git a/COMPILING b/COMPILING
deleted file mode 100644
index 902dd595..00000000
--- a/COMPILING
+++ /dev/null
@@ -1,72 +0,0 @@
-developer documentation for GtkRadiant 1.6.0 (Zeroradiant)
-==========================================================
-
-getting the source
-==================
-
-The latest source is available from the Subversion repository.
- https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk/
-
-The subversion client can be obtained from the Subversion site.
- http://subversion.tigris.org
-
-To get a copy of the source using the commandline Subversion client:
- Change the current directory to the desired location for the source.
- svn checkout https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk/ ./GtkRadiant
-
-Download the desired game packs:
- cd ./GtkRadiant/install/installs
- svn checkout https://zerowing.idsoftware.com/svn/radiant.gamepacks/Q3Pack/trunk/ ./Q3Pack
- svn checkout https://zerowing.idsoftware.com/svn/radiant.gamepacks/UFOAIPack/trunk/ ./UFOAIPack
- svn checkout https://zerowing.idsoftware.com/svn/radiant.gamepacks/TremulousPack/trunk/ ./TremulousPack
-
-Linux/OSX(using X-windows)
-==========================
-
-environment:
-- gcc >= version 3.1 (preferably)
-- scons >= 0.96 (radiant is built with scons rather than make)
-- python >= 2.3.0, (scons requires python, some build steps use python)
-- svn >= 1.1 (some build steps use svn)
-
-dependencies:
-- gtk+ >= 2.4.0 (requires glib, atk, pango, iconv, etc)
-- gtkglext >= 1.0.0 (requires opengl)
-- libxml2 >= 2.0.0
-- zlib >= 1.2.0 (for archivezip module)
-- libpng >= 1.2.0 (for imagepng module)
-
-build:
-Execute 'scons' in the directory containing SConscript
-
-install:
-run 'python ./GtkRadiant/install.py'
-note - this script should be run after each time you update from svn
-
-run:
-Execute './GtkRadiant/install/radiant.x86' (or './GtkRadiant/install/radiant.ppc' on osx)
-
-
-Win32 (2000, XP or Vista)
-==================
-
-environment:
-- visual studio 2005
-- python 2.3.0 or later (some build steps use python)
-- subversion 1.1 or later (some build steps use svn)
-
-dependencies are prepackaged archives, extract them to the directory above GtkRadiant.sln:
-- http://zerowing.idsoftware.com/files/radiant/developer/1.5/gtkradiant-1.5-dependencies-1.0.zip
-
-build:
-Open GtkRadiant.sln.
-In tools > options > projects > VC++ Directories > executables, add the paths to python.exe (e.g. c:\python23\) and svn.exe (e.g. c:\svn\)
-Hit 'Build > Build Solution' (F7)
-
-install:
-run 'python ./GtkRadiant/install.py'
-note - this script should be run after each time you update from svn
-
-run:
-set Project > Properties > Debugging > Command to "$(SolutionDir)install/$(TargetFileName)"
-hit 'Debug > Start' (F5)
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 323dbd0d..49833edb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,4 +1,4 @@
-GtkRadiant CONTRIBUTORS and CREDITS
+GtkRadiant past contributors and credits
last update: 01/15/2001
=======================
diff --git a/CONTRIBUTOR_AGREEMENT b/CONTRIBUTOR_AGREEMENT
deleted file mode 100644
index e69de29b..00000000
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index ff51851d..00000000
--- a/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
- * converted the project files to VC8
- * default parameters can't be used in function typedefs anymore, removed those and fixed the code accordingly
diff --git a/DarwinCompileInfo.rtf b/DarwinCompileInfo.rtf
deleted file mode 100644
index ff5cfb16..00000000
--- a/DarwinCompileInfo.rtf
+++ /dev/null
@@ -1,55 +0,0 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
-{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\margl1440\margr1440\vieww9000\viewh9000\viewkind0
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-\f0\fs24 \cf0 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 Install XFree86\
- see\
- http://xfree86.org and http://mrcla.com/XonX \
- on installing X Window System on your OS X\
-\
-Download these:\
-ftp://gnu-darwin.sourceforge.net/pub/gnu-darwin/gtk+-1.2.8.tgz\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 ftp://gnu-darwin.sourceforge.net/pub/gnu-darwin/Mesa-3.4.tgz\
-\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 Untar these with \
- tar xzvf gtk+-1.2.8.tgz\
- tar xzvf Mesa-3.4.tgz\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 \
-change to root , go into these directory and type:\
-make install\
-(This will install gtk and Mesa)\
-\
-download this:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 http://prdownloads.sourceforge.net/fink/dlcompat-20010123.tar.gz\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 tar xzvf dlcompat*\
-cd dlcompat*\
-make\
-make install # do this as soot\
-\
-cd GtkRadiant/libs/libxml2/\
-./configure\
-make\
-make install\
-\
-cd GtkRadiant/libs/\
-make\
-\
-cd GtrRadiant/tools/\
-make\
-(This will give you a q3map executable )\
-\
-cd GtkRadiant/radiant/\
-make\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 (This will give you a radiant executable )\
-\
-}
diff --git a/DoxyConfig b/DoxyConfig
deleted file mode 100644
index fc7f6821..00000000
--- a/DoxyConfig
+++ /dev/null
@@ -1,47 +0,0 @@
-# Included Doxygen Config file
-#---------------------------------------------------------------------------
-# Project name & version number
-#---------------------------------------------------------------------------
-PROJECT_NAME =
-PROJECT_NUMBER =
-
-#---------------------------------------------------------------------------
-# Where to put the output
-# Note: The images dir should be next to the created html dir within the
-# output dir.
-# eg;
-# [Current Dir]
-# L__[OUTPUT_DIRECTORY]
-# L__[html]
-# L__[images]
-#---------------------------------------------------------------------------
-OUTPUT_DIRECTORY = ../GtkRadiant-doxygen
-
-#---------------------------------------------------------------------------
-# Where to read the sources
-# you can add more than one source...
-# INPUT = radiant/ \
-# tools/quake3/q3map \
-# tools/quake3/q3data
-#
-# Recursive is set on, so setting it to ./ (current dir) would read source
-# files recursively from the current dir down. (which would take a while)
-#
-# eg: To document just include, if the current directory is ../GtkRadiant/
-# then...
-#---------------------------------------------------------------------------
-INPUT = GtkRadiant/include/
-
-#---------------------------------------------------------------------------
-# Misc settings
-# TAB_SIZE - sets the indenting for the inline source and the source
-# browser
-# INCLUDE_PATH - will include documentation for included files from other
-# packages. You can specify more than one path the same as
-# shown in the INPUT example Leave it blank if you don't want
-# this.
-# PERL_PATH - path to the perl executable
-#
-#---------------------------------------------------------------------------
-PERL_PATH = /usr/bin/perl
-
diff --git a/Doxyfile b/Doxyfile
deleted file mode 100644
index a992b3d4..00000000
--- a/Doxyfile
+++ /dev/null
@@ -1,170 +0,0 @@
-# Doxyfile 1.2.5-20010304
-#---------------------------------------------------------------------------
-# General configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME =
-PROJECT_NUMBER =
-OUTPUT_DIRECTORY =
-OUTPUT_LANGUAGE = English
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = YES
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ALWAYS_DETAILED_SEC = NO
-FULL_PATH_NAMES = YES
-STRIP_FROM_PATH = $(PWD)/
-INTERNAL_DOCS = YES
-CLASS_DIAGRAMS = YES
-SOURCE_BROWSER = YES
-INLINE_SOURCES = YES
-STRIP_CODE_COMMENTS = YES
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-VERBATIM_HEADERS = YES
-SHOW_INCLUDE_FILES = YES
-JAVADOC_AUTOBRIEF = YES
-INHERIT_DOCS = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-DISTRIBUTE_GROUP_DOC = NO
-TAB_SIZE =
-ENABLED_SECTIONS =
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-ALIASES =
-MAX_INITIALIZER_LINES = 30
-OPTIMIZE_OUTPUT_FOR_C = NO
-SHOW_USED_FILES = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = YES
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE = doxygen.log
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT =
-FILE_PATTERNS = *.h \
- *.cpp \
- *.c
-RECURSIVE = YES
-EXCLUDE = *.dsp \
- *.dsw \
- *.o \
- *.d \
- *.ico \
- *.bmp \
- *.txt \
- *.rc \
- Entries \
- Entries.Log \
- Repository \
- Root
-EXCLUDE_PATTERNS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_SOURCE_FILES = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 4
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT =
-HTML_HEADER = Doxygen_extras/doxygen_gtkradiant_head.html
-HTML_FOOTER = Doxygen_extras/doxygen_gtkradiant_foot.html
-HTML_STYLESHEET = Doxygen_extras/doxygen_gtkradiant.css
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT =
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT =
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT =
-MAN_EXTENSION = .3
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = YES
-EXPAND_ONLY_PREDEF = YES
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-HAVE_DOT = YES
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-GRAPHICAL_HIERARCHY = YES
-DOT_PATH =
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
-CGI_NAME = search.cgi
-CGI_URL =
-DOC_URL =
-DOC_ABSPATH =
-BIN_ABSPATH = /usr/local/bin/
-EXT_DOC_PATHS =
-
-#---------------------------------------------------------------------------
-# Include file, at the bottom to over-ride anything I missed.
-#---------------------------------------------------------------------------
-@INCLUDE = DoxyConfig
diff --git a/Doxygen_files/Doxyfile b/Doxygen_files/Doxyfile
deleted file mode 100644
index 912e2b99..00000000
--- a/Doxygen_files/Doxyfile
+++ /dev/null
@@ -1,159 +0,0 @@
-# Doxyfile 1.2.5-20010304
-#---------------------------------------------------------------------------
-# General configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME =
-PROJECT_NUMBER =
-OUTPUT_DIRECTORY =
-OUTPUT_LANGUAGE = English
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = YES
-EXTRACT_STATIC = YES
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ALWAYS_DETAILED_SEC = YES
-FULL_PATH_NAMES = YES
-STRIP_FROM_PATH = $(PWD)/
-INTERNAL_DOCS = YES
-CLASS_DIAGRAMS = YES
-SOURCE_BROWSER = YES
-INLINE_SOURCES = YES
-STRIP_CODE_COMMENTS = NO
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-VERBATIM_HEADERS = YES
-SHOW_INCLUDE_FILES = YES
-JAVADOC_AUTOBRIEF = YES
-INHERIT_DOCS = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-DISTRIBUTE_GROUP_DOC = NO
-TAB_SIZE = 2
-ENABLED_SECTIONS =
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-ALIASES =
-MAX_INITIALIZER_LINES = 30
-OPTIMIZE_OUTPUT_FOR_C = NO
-SHOW_USED_FILES = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = YES
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE = doxygen.log
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT =
-FILE_PATTERNS = *.h \
- *.cpp \
- *.c
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_PATTERNS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_SOURCE_FILES = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 4
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT =
-HTML_HEADER = Doxygen_files/doxygen_gtkradiant_head.html
-HTML_FOOTER = Doxygen_files/doxygen_gtkradiant_foot.html
-HTML_STYLESHEET = Doxygen_files/doxygen_gtkradiant.css
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT =
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT =
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT =
-MAN_EXTENSION = .3
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = YES
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-HAVE_DOT = YES
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-GRAPHICAL_HIERARCHY = YES
-DOT_PATH =
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
-CGI_NAME = search.cgi
-CGI_URL =
-DOC_URL =
-DOC_ABSPATH =
-BIN_ABSPATH = /usr/local/bin/
-EXT_DOC_PATHS =
-
-#---------------------------------------------------------------------------
-# Include file, at the bottom to over-ride anything I missed.
-#---------------------------------------------------------------------------
-@INCLUDE = genConf
\ No newline at end of file
diff --git a/Doxygen_files/doxy_mainpage.h b/Doxygen_files/doxy_mainpage.h
deleted file mode 100644
index 34b43d9d..00000000
--- a/Doxygen_files/doxy_mainpage.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-** Doxygen index.html generation file
-**
-*/
-
-/*! \mainpage +project+ Doxygen Index
-
- \section intro Introduction
-
- This documentation was generated from GtkRadiant source code using Doxygen.
- Generated from source in: +target+
-
- \section links Links
- General Links
- Doxygen Homepage
- GtkRadiant Homepage
- Zerowing - GtkRadiant Development
-
- Local Links
- Doxygen Quick Reference (Local)
-
-
- GtkRadiant FAQ Links
- GtkRadiant FAQ
- GtkRadiant FAQ: Open Tasks
- GtkRadiant FAQ: Compiling instructions
- GtkRadiant FAQ: Creating/Submitting patches
- GtkRadiant FAQ: Coding Conventions & Guidelines
-
-
- Misc Links
- idsoftware.com
-
-
-
- * Note: The content on this page was generated from this file.
- It is moved into the path when the doxygen documentation is generated, and removed immediately
- afterwards.
-
-
-
- This page generated: by +user+ on +machine+
- On +date+
-
-*/
diff --git a/Doxygen_files/doxygen_gtkradiant.css b/Doxygen_files/doxygen_gtkradiant.css
deleted file mode 100644
index ad85caff..00000000
--- a/Doxygen_files/doxygen_gtkradiant.css
+++ /dev/null
@@ -1,34 +0,0 @@
-body { background-color: black; }
-IMG { border-color: #222222; border: 0; }
-em { font-size: 11px; font-style: italic; font-weight: normal; color: #888888; }
-H1 { text-align: center; font-size: 15px; color: #2222AA; font-family: Geneva, Verdana, Helvetica, Arial, sans-serif; }
-H3 { text-align: center; font-size: 18px; color: #2222AA; font-family: Geneva, Verdana, Helvetica, Arial, sans-serif; }
-A { text-decoration: none; color: #6666DD; }
-A:HOVER { text-decoration: underline; color: #4444FF; }
-A:VISITED { text-decoration: none; color: #8888AA; }
-A.qindex { text-decoration: none; color: #6666DD; font-size: 11px; }
-A.qindex:HOVER { text-decoration: underline; color: #4444FF; font-size: 11px; }
-A.qindex:VISITED { text-decoration: none; color: #8888AA; font-size: 11px; }
-A.qindexRef { font-size: 11px; }
-A.el { text-decoration: none; font-weight: bold; }
-A.elRef { font-weight: bold; }
-A.code { text-decoration: none; font-weight: normal; color: #6666DD; }
-A.code:HOVER { text-decoration: underline; font-weight: normal; color: #4444FF; }
-A.code:VISITED { text-decoration: none; font-weight: normal; color: #8888AA; }
-A.codeRef { text-decoration: none; font-weight: normal; color: #6666DD; }
-A.codeRef:HOVER { text-decoration: underline; font-weight: normal; color: #4444FF; }
-A.codeRef:VISITED { text-decoration: none; font-weight: normal; color: #8888AA; }
-DL.el { margin-left: 2cm; width: 99%; }
-DIV.fragment { background-color: #FFFFFF; width: 99%; }
-DIV.ah { background-color: #AAAAAA; width: 99%; margin-bottom: 3; margin-top: 3; }
-TD.md { cellpadding: 0; background-color: #DDDDDD; border: 0; width: 99%; color: #222222; }
-DIV.groupHeader { margin-left: 16; margin-top: 12; margin-bottom: 6; font-weight: bold; color: #222222; }
-DIV.groupText { margin-left: 16; font-style: italic; font-size: smaller; }
-FONT.keyword { color: #0080A0; }
-FONT.keywordtype { color: #604020; }
-FONT.keywordflow { color: #E08000; }
-FONT.comment { color: #800000; }
-FONT.comment { color: #009900; text-decoration: italic; }
-FONT.preprocessor { color: #806020; }
-FONT.stringliteral{ color: #002080; }
-FONT.charliteral { color: #008080; }
diff --git a/Doxygen_files/doxygen_gtkradiant_foot.html b/Doxygen_files/doxygen_gtkradiant_foot.html
deleted file mode 100644
index 46162436..00000000
--- a/Doxygen_files/doxygen_gtkradiant_foot.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
- |
-
-
- |
-
-
- |
-
-
-
-
-
- |
-
-
-
-
-
-