1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
|
--- SConscript.orig 2006-02-10 22:01:20 UTC
+++ SConscript
@@ -1,4 +1,4 @@
-import os, sys, commands, string
+import os, sys, subprocess as commands, string
from makeversion import get_version
# OS Detection:
OS = commands.getoutput('uname')
@@ -23,7 +23,7 @@ md5lib_lib = g_env.StaticLibrary(target='libs/md5lib',
ddslib_lib = g_env.StaticLibrary(target='libs/ddslib', source='libs/ddslib/ddslib.c')
-jpeg_env = g_env.Copy()
+jpeg_env = g_env.Clone()
jpeg_env.Prepend(CPPPATH = 'libs/jpeg6')
jpeg_src = 'jcomapi.cpp jdcoefct.cpp jdinput.cpp jdpostct.cpp jfdctflt.cpp jpgload.cpp jdapimin.cpp jdcolor.cpp jdmainct.cpp jdsample.cpp jidctflt.cpp jutils.cpp jdapistd.cpp jddctmgr.cpp jdmarker.cpp jdtrans.cpp jmemmgr.cpp jdatasrc.cpp jdhuff.cpp jdmaster.cpp jerror.cpp jmemnobs.cpp'
jpeg_lib = jpeg_env.StaticLibrary(target='libs/jpeg6', source=build_list('libs/jpeg6', jpeg_src))
@@ -35,17 +35,17 @@ picomodel_src = 'picointernal.c picomodel.c picomodule
lwo/lwo2.c lwo/lwob.c lwo/pntspols.c lwo/surface.c lwo/vecmath.c lwo/vmap.c'
picomodel_lib = g_env.StaticLibrary(target='libs/picomodel', source=build_list('libs/picomodel', picomodel_src))
-#splines_env = g_env.Copy()
+#splines_env = g_env.Clone()
#splines_src = build_list('libs/splines', 'math_angles.cpp math_matrix.cpp math_quaternion.cpp math_vector.cpp q_parse.cpp q_shared.cpp splines.cpp util_str.cpp')
#splines_env['CPPPATH'].append('include')
#splines_lib = splines_env.StaticLibrary(target='libs/splines', source=splines_src)
-profile_env = g_env.Copy();
+profile_env = g_env.Clone();
profile_env['CPPPATH'].append('include')
profile_src = 'profile.cpp file.cpp'
profile_lib = profile_env.StaticLibrary(target='libs/profile', source=build_list('libs/profile', profile_src))
-gtkutil_env = g_env.Copy();
+gtkutil_env = g_env.Clone();
gtkutil_env['CPPPATH'].append('include')
gtkutil_env.useGlib2()
gtkutil_env.useGtk2()
@@ -83,7 +83,7 @@ gtkutil_lib = gtkutil_env.StaticLibrary(target='libs/g
# q3map ---------------------------------------------------------------------------
-q3map_env = g_env.Copy()
+q3map_env = g_env.Clone()
q3map_env['CPPPATH'].append('include')
q3map_env.useXML2()
q3map_env.useGlib2()
@@ -160,7 +160,7 @@ q3map_env.Install(INSTALL, q3map_prog)
# q3data ---------------------------------------------------------------------------
-q3data_env = q3map_env.Copy()
+q3data_env = q3map_env.Clone()
q3data_common_src = [
'common/aselib.c',
@@ -200,7 +200,7 @@ q3data_env.Install( INSTALL, q3data_prog )
# q2_tools ---------------------------------------------------------------------------
-q2_tools_env = g_env.Copy()
+q2_tools_env = g_env.Clone()
q2_tools_env['CPPPATH'].append('include')
q2_tools_env.useXML2()
q2_tools_env.usePThread()
@@ -290,7 +290,7 @@ if ( OS != 'Darwin' ):
# qdata3_heretic2 ---------------------------------------------------------------------------
-heretic2_tools_env = g_env.Copy()
+heretic2_tools_env = g_env.Clone()
heretic2_tools_env['CPPPATH'].append('include')
heretic2_tools_env.useXML2()
heretic2_tools_env.usePThread()
@@ -355,48 +355,46 @@ if ( OS != 'Darwin' ):
# radiant, modules and plugins ----------------------------------------------------
-module_env = g_env.Copy()
+module_env = g_env.Clone()
module_env['CPPPATH'].append('include')
if ( OS == 'Darwin' ):
module_env['LINKFLAGS'] += '-dynamiclib -ldl '
-else:
- module_env['LINKFLAGS'] += '-ldl '
module_env['LIBPREFIX'] = ''
-vfspk3_env = module_env.Copy()
+vfspk3_env = module_env.Clone()
vfspk3_lst = build_list('plugins/vfspk3', 'vfspk3.cpp vfs.cpp archive.cpp')
vfspk3_env.useGlib2()
vfspk3_lib = vfspk3_env.SharedLibrarySafe(target='vfspk3', source=vfspk3_lst)
vfspk3_env.Install(INSTALL + '/modules', vfspk3_lib)
-archivepak_env = module_env.Copy()
+archivepak_env = module_env.Clone()
archivepak_lst = build_list('plugins/archivepak', 'plugin.cpp archive.cpp pak.cpp')
archivepak_lib = archivepak_env.SharedLibrarySafe(target='archivepak', source=archivepak_lst, LIBS='cmdlib', LIBPATH='libs')
archivepak_env.Depends(archivepak_lib, cmdlib_lib)
archivepak_env.Install(INSTALL + '/modules', archivepak_lib)
-archivewad_env = module_env.Copy()
+archivewad_env = module_env.Clone()
archivewad_lst = build_list('plugins/archivewad', 'plugin.cpp archive.cpp wad.cpp')
archivewad_lib = archivewad_env.SharedLibrarySafe(target='archivewad', source=archivewad_lst, LIBS='cmdlib', LIBPATH='libs')
archivewad_env.Depends(archivewad_lib, cmdlib_lib)
archivewad_env.Install(INSTALL + '/modules', archivewad_lib)
-archivezip_env = module_env.Copy()
+archivezip_env = module_env.Clone()
archivezip_lst = build_list('plugins/archivezip', 'plugin.cpp archive.cpp pkzip.cpp zlibstream.cpp')
archivezip_env.useZLib()
archivezip_lib = archivezip_env.SharedLibrarySafe(target='archivezip', source=archivezip_lst, LIBS='cmdlib', LIBPATH='libs')
archivezip_env.Depends(archivezip_lib, cmdlib_lib)
archivezip_env.Install(INSTALL + '/modules', archivezip_lib)
-shaders_env = module_env.Copy()
+shaders_env = module_env.Clone()
shaders_lst = build_list('plugins/shaders', 'shaders.cpp plugin.cpp')
shaders_env.useGlib2()
shaders_lib = shaders_env.SharedLibrarySafe(target='shaders', source=shaders_lst, LIBS='cmdlib', LIBPATH='libs')
shaders_env.Depends(shaders_lib, cmdlib_lib)
shaders_env.Install(INSTALL + '/modules', shaders_lib)
-image_env = module_env.Copy()
+image_env = module_env.Clone()
image_lst = build_list('plugins/image', 'bmp.cpp jpeg.cpp image.cpp pcx.cpp tga.cpp dds.cpp')
image_lib = image_env.SharedLibrarySafe(target='image', source=image_lst, LIBS=['jpeg6', 'ddslib'], LIBPATH='libs')
image_env.Depends(image_lib, jpeg_lib)
@@ -411,26 +409,26 @@ imageq2_lst = build_list('plugins/imageq2', 'imageq2.c
imageq2_lib = module_env.SharedLibrarySafe(target='imageq2', source=imageq2_lst)
module_env.Install(INSTALL + '/modules', imageq2_lib)
-mapq3_env = module_env.Copy()
+mapq3_env = module_env.Clone()
mapq3_lst=build_list('plugins/mapq3', 'plugin.cpp parse.cpp write.cpp')
mapq3_lib = mapq3_env.SharedLibrarySafe(target='mapq3', source=mapq3_lst, LIBS='cmdlib', LIBPATH='libs')
mapq3_env.Depends(mapq3_lib, cmdlib_lib)
mapq3_env.Install(INSTALL + '/modules', mapq3_lib)
-imagepng_env = module_env.Copy()
+imagepng_env = module_env.Clone()
imagepng_lst = build_list('plugins/imagepng', 'plugin.cpp')
imagepng_env.usePNG()
imagepng_lib = imagepng_env.SharedLibrarySafe(target='imagepng', source=imagepng_lst)
imagepng_env.Install(INSTALL + '/modules', imagepng_lib)
-mapxml_env = module_env.Copy()
+mapxml_env = module_env.Clone()
mapxml_lst = build_list('plugins/mapxml', 'plugin.cpp xmlparse.cpp xmlwrite.cpp')
mapxml_lib = mapxml_env.SharedLibrarySafe(target='mapxml', source=mapxml_lst)
mapxml_env.useXML2()
mapxml_env.useGlib2()
mapxml_env.Install(INSTALL + '/modules', mapxml_lib)
-model_env = module_env.Copy()
+model_env = module_env.Clone()
model_lst = build_list('plugins/model', 'plugin.cpp model.cpp')
model_lib = model_env.SharedLibrarySafe(target='model', source=model_lst, LIBS=['mathlib', 'picomodel'], LIBPATH='libs')
model_env.Depends(model_lib, mathlib_lib)
@@ -445,7 +443,7 @@ entity_lst = build_list('plugins/entity', 'plugin.cpp
entity_lib = module_env.SharedLibrarySafe(target='entity', source=entity_lst)
module_env.Install(INSTALL + '/modules', entity_lib)
-#bob_env = module_env.Copy()
+#bob_env = module_env.Clone()
#bob_env.useGtk2()
#bob_lst = build_list('contrib/bobtoolz/',
#'dialogs/dialogs-gtk.cpp bobToolz-GTK.cpp bsploader.cpp cportals.cpp DBobView.cpp \
@@ -466,7 +464,7 @@ module_env.Install(INSTALL + '/modules', entity_lib)
#prtview_lst = build_list('contrib/prtview',
#'AboutDialog.cpp ConfigDialog.cpp LoadPortalFileDialog.cpp portals.cpp prtview.cpp')
-#prtview_env = bob_env.Copy()
+#prtview_env = bob_env.Clone()
#prtview_env['CXXFLAGS'] += '-DGTK_PLUGIN '
#prtview_env.SharedLibrarySafe(target='prtview', source=prtview_lst)
#prtview_env.Install(INSTALL + '/plugins', 'prtview.so')
@@ -478,14 +476,14 @@ module_env.Install(INSTALL + '/modules', entity_lib)
#bkgrnd2d_list = build_list( 'contrib/bkgrnd2d', 'bkgrnd2d.cpp plugin.cpp dialog.cpp' )
#bkgrnd2d_list.append( 'libs/libsynapse.a' )
-#bkgrnd2d_env = module_env.Copy()
+#bkgrnd2d_env = module_env.Clone()
#bkgrnd2d_env.useGtk2()
#bkgrnd2d_env.SharedLibrarySafe( target='bkgrnd2d', source=bkgrnd2d_list )
#bkgrnd2d_env.Install( INSTALL + '/plugins', 'bkgrnd2d.so' )
-radiant_env = g_env.Copy()
+radiant_env = g_env.Clone()
radiant_env['CPPPATH'].append('include')
-radiant_env['LINKFLAGS'] += '-ldl -lGL '
+radiant_env['LINKFLAGS'] += '-lX11 -lGL '
if ( OS == 'Darwin' ):
radiant_env['CXXFLAGS'] += '-fno-common '
radiant_env['CCFLAGS'] += '-fno-common '
@@ -597,11 +595,11 @@ class setup_builder:
def system(self, cmd):
if (self.g_dryrun):
- print cmd
+ print(cmd)
else:
sys.stdout.write(cmd)
ret = commands.getstatusoutput(cmd)
- print ret[1]
+ print(ret[1])
if (ret[0] != 0):
raise 'command failed'
@@ -807,7 +805,7 @@ class setup_builder:
self.system('setup/linux/makeself/makeself.sh ' + self.SETUP_DIR + ' ' + self.SETUP_TARGET + ' "GtkRadiant ' + self.line + ' setup" ./setup.sh')
if (self.g_darwin):
def build_fink_deb(self):
- print "Building installer .deb\n"
+ print("Building installer .deb\n")
self.F_REV = '1'
self.FINKINFO_DIR = '/sw/fink/10.2/unstable/main/finkinfo/games'
self.TARBALL_DIR='radiant-' + self.F_REV + '.' + self.major
@@ -833,7 +831,7 @@ class setup_builder:
else:
self.g_darwin = 0
(self.line, self.major, self.minor) = get_version()
- print 'Setup: GtkRadiant %s' % self.line
+ print('Setup: GtkRadiant %s' % self.line)
if ( self.g_darwin ):
self.SETUP_IMAGE_OS = '../loki_setup/image'
else:
@@ -860,7 +858,7 @@ class setup_builder:
self.DO_GAME_ET=0
self.DO_GAME_HER2=0
# verbose a bit
- print 'version: %s major: %s minor: %s\neditor core: %d\nq3: %d\nwolf: %d\net: %d\ndoom3: %d\nq2: %d\nher2: %d' % (self.line, self.major, self.minor, self.DO_CORE, self.DO_GAME_Q3, self.DO_GAME_WOLF, self.DO_GAME_ET, self.DO_GAME_DOOM3, self.DO_GAME_Q2, self.DO_GAME_HER2)
+ print('version: %s major: %s minor: %s\neditor core: %d\nq3: %d\nwolf: %d\net: %d\ndoom3: %d\nq2: %d\nher2: %d' % (self.line, self.major, self.minor, self.DO_CORE, self.DO_GAME_Q3, self.DO_GAME_WOLF, self.DO_GAME_ET, self.DO_GAME_DOOM3, self.DO_GAME_Q2, self.DO_GAME_HER2))
if (self.DO_CORE):
self.copy_core()
if (self.DO_GAME_Q3):
|
