mirror of
https://github.com/TTimo/GtkRadiant.git
synced 2024-11-10 07:11:54 +00:00
put q3map2.exe x64 in install/x64, and copy the dependent DLLs
This commit is contained in:
Timothee Besset
parent
4c9f5c5229
commit
0241ec6d9b
4 changed files with 64 additions and 48 deletions
90
config.py
90
config.py
|
|
@ -6,6 +6,7 @@ if __name__ != '__main__':
|
|||
import utils, urllib2, zipfile, shutil, pprint, subprocess, re, os.path
|
||||
|
||||
GTK_PREFIX='gtk-2.24.10'
|
||||
GTK64_PREFIX='gtk-2.22.1_win64'
|
||||
|
||||
class Config:
|
||||
# aliases
|
||||
|
|
@ -313,49 +314,56 @@ class Config:
|
|||
|
||||
# copy all the dependent runtime data to the install directory
|
||||
srcdir = os.path.dirname( backup_cwd )
|
||||
for dll in [
|
||||
'%s/bin/freetype6.dll' % GTK_PREFIX,
|
||||
'%s/bin/intl.dll' % GTK_PREFIX,
|
||||
'%s/bin/libasprintf-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libatk-1.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libcairo-2.dll' % GTK_PREFIX,
|
||||
'%s/bin/libexpat-1.dll' % GTK_PREFIX,
|
||||
'%s/bin/libfontconfig-1.dll' % GTK_PREFIX,
|
||||
'%s/bin/libgailutil-18.dll' % GTK_PREFIX,
|
||||
'%s/bin/libgcc_s_dw2-1.dll' % GTK_PREFIX,
|
||||
'%s/bin/libgdk-win32-2.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libgdk_pixbuf-2.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libgio-2.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libglib-2.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libgmodule-2.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libgobject-2.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libgthread-2.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libgtk-win32-2.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libpango-1.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libpangocairo-1.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libpangoft2-1.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libpangowin32-1.0-0.dll' % GTK_PREFIX,
|
||||
'%s/bin/libpng14-14.dll' % GTK_PREFIX,
|
||||
'%s/bin/zlib1.dll' % GTK_PREFIX,
|
||||
'%s/lib/GNU.Gettext.dll' % GTK_PREFIX,
|
||||
'%s/lib/gtk-2.0/2.10.0/engines/libpixmap.dll' % GTK_PREFIX,
|
||||
'%s/lib/gtk-2.0/2.10.0/engines/libwimp.dll' % GTK_PREFIX,
|
||||
'%s/lib/gtk-2.0/modules/libgail.dll' % GTK_PREFIX,
|
||||
'gtkglext-1.2.0/bin/libgdkglext-win32-1.0-0.dll',
|
||||
'gtkglext-1.2.0/bin/libgtkglext-win32-1.0-0.dll',
|
||||
# going static
|
||||
# 'libxml2-2.7.3/bin/libxml2-2.dll'
|
||||
]:
|
||||
shutil.copy( os.path.join( srcdir, dll ), 'install' )
|
||||
# for dll in [
|
||||
# '%s/bin/freetype6.dll' % GTK_PREFIX,
|
||||
# '%s/bin/intl.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libasprintf-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libatk-1.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libcairo-2.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libexpat-1.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libfontconfig-1.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libgailutil-18.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libgcc_s_dw2-1.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libgdk-win32-2.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libgdk_pixbuf-2.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libgio-2.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libglib-2.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libgmodule-2.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libgobject-2.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libgthread-2.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libgtk-win32-2.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libpango-1.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libpangocairo-1.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libpangoft2-1.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libpangowin32-1.0-0.dll' % GTK_PREFIX,
|
||||
# '%s/bin/libpng14-14.dll' % GTK_PREFIX,
|
||||
# '%s/bin/zlib1.dll' % GTK_PREFIX,
|
||||
# '%s/lib/GNU.Gettext.dll' % GTK_PREFIX,
|
||||
# '%s/lib/gtk-2.0/2.10.0/engines/libpixmap.dll' % GTK_PREFIX,
|
||||
# '%s/lib/gtk-2.0/2.10.0/engines/libwimp.dll' % GTK_PREFIX,
|
||||
# '%s/lib/gtk-2.0/modules/libgail.dll' % GTK_PREFIX,
|
||||
# 'gtkglext-1.2.0/bin/libgdkglext-win32-1.0-0.dll',
|
||||
# 'gtkglext-1.2.0/bin/libgtkglext-win32-1.0-0.dll',
|
||||
## going static
|
||||
## 'libxml2-2.7.3/bin/libxml2-2.dll'
|
||||
# ]:
|
||||
# shutil.copy( os.path.join( srcdir, dll ), 'install' )
|
||||
#
|
||||
# for extra in [
|
||||
# '%s/etc' % GTK_PREFIX,
|
||||
# '%s/share' % GTK_PREFIX,
|
||||
# 'gtkglext-1.2.0/share',
|
||||
## TODO
|
||||
## 'libxml2-2.7.3/share'
|
||||
# ]:
|
||||
# self.CopyTree( os.path.join( srcdir, extra ), 'install' )
|
||||
|
||||
for extra in [
|
||||
'%s/etc' % GTK_PREFIX,
|
||||
'%s/share' % GTK_PREFIX,
|
||||
'gtkglext-1.2.0/share',
|
||||
# TODO
|
||||
# 'libxml2-2.7.3/share'
|
||||
for x64_dll in [
|
||||
'%s/bin/libpng14-14.dll' % GTK64_PREFIX,
|
||||
'%s/bin/libglib-2.0-0.dll' % GTK64_PREFIX,
|
||||
'%s/bin/libintl-8.dll' % GTK64_PREFIX,
|
||||
]:
|
||||
self.CopyTree( os.path.join( srcdir, extra ), 'install' )
|
||||
shutil.copy( os.path.join( srcdir, x64_dll ), 'install/x64' )
|
||||
|
||||
def FinishBuild( self, target, source, env ):
|
||||
print( 'Lookup and bundle the PNG and JPEG libraries' )
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
/* version */
|
||||
#define Q3MAP_VERSION "2.5.17"
|
||||
#define Q3MAP_MOTD "Last one turns the lights off"
|
||||
#define Q3MAP_MOTD "We're still here"
|
||||
|
||||
|
||||
/* -------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -60,14 +60,20 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>$(SolutionDir)\install\</OutDir>
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
|
||||
<OutDir>$(SolutionDir)\install\$(Platform)\</OutDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>$(SolutionDir)\install\</OutDir>
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
|
||||
<OutDir>$(SolutionDir)\install\$(Platform)\</OutDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
|
|
|
|||
|
|
@ -72,19 +72,21 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>$(SolutionDir)\install\</OutDir>
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>$(SolutionDir)\install\</OutDir>
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<IntDir>$(SolutionDir)\build\intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Midl>
|
||||
|
|
|
|||
Loading…
Reference in a new issue