ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

misc fixes

Browse source
This commit is contained in:
Timothee 'TTimo' Besset 2012-08-23 22:39:53 -05:00
parent c43c3d968f
commit fe7062c8b9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
config.py
View file

@ -33,7 +33,7 @@ class Config:
# platforms for which to assemble a setup # platforms for which to assemble a setup
self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ] self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ]
# paks to assemble in the setup # paks to assemble in the setup
self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack' ] # 'UFOAIPack', 'Q2WPack', 'ReactionPack' ] self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack' ]
def __repr__( self ): def __repr__( self ):
return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected ) return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
@ -185,9 +185,10 @@ class Config:
if 'setup' in self.target_selected: if 'setup' in self.target_selected:
self.Setup() self.Setup()
finish_command = Command( 'finish', [], self.FinishBuild ) if ( self.platform != 'win32' ):
Depends( finish_command, DEFAULT_TARGETS ) finish_command = Command( 'finish', [], self.FinishBuild )
Default( finish_command ) Depends( finish_command, DEFAULT_TARGETS )
Default( finish_command )
def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False, useZ = False, usePNG = False ): def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False, useZ = False, usePNG = False ):
env['CC'] = self.cc env['CC'] = self.cc

1
plugins/imagepng/plugin.cpp
View file

@ -63,7 +63,6 @@ extern "C" CSynapseClient * SYNAPSE_DLL_EXPORT Synapse_EnumerateInterfaces( cons
g_SynapseClient.AddAPI( IMAGE_MAJOR, "png", sizeof( _QERPlugImageTable ) ); g_SynapseClient.AddAPI( IMAGE_MAJOR, "png", sizeof( _QERPlugImageTable ) );
g_SynapseClient.AddAPI( RADIANT_MAJOR, NULL, sizeof( _QERFuncTable_1 ), SYN_REQUIRE, &g_FuncTable ); g_SynapseClient.AddAPI( RADIANT_MAJOR, NULL, sizeof( _QERFuncTable_1 ), SYN_REQUIRE, &g_FuncTable );
// NOTE: if imagepng starts being used for non "VFS" "pk3" config, need to add a dynamic config chunk
g_SynapseClient.AddAPI( VFS_MAJOR, "pk3", sizeof( _QERFileSystemTable ), SYN_REQUIRE, &g_FileSystemTable ); g_SynapseClient.AddAPI( VFS_MAJOR, "pk3", sizeof( _QERFileSystemTable ), SYN_REQUIRE, &g_FileSystemTable );
return &g_SynapseClient; return &g_SynapseClient;