From fe7062c8b98c9e2d6c66a0876fe888dd1fb99cca Mon Sep 17 00:00:00 2001 From: Timothee 'TTimo' Besset Date: Thu, 23 Aug 2012 22:39:53 -0500 Subject: [PATCH] misc fixes --- config.py | 9 +++++---- plugins/imagepng/plugin.cpp | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.py b/config.py index ffaaf092..09d33cdc 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ class Config: # platforms for which to assemble a setup self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ] # 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 ): return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected ) @@ -185,9 +185,10 @@ class Config: if 'setup' in self.target_selected: self.Setup() - finish_command = Command( 'finish', [], self.FinishBuild ) - Depends( finish_command, DEFAULT_TARGETS ) - Default( finish_command ) + if ( self.platform != 'win32' ): + finish_command = Command( 'finish', [], self.FinishBuild ) + Depends( finish_command, DEFAULT_TARGETS ) + Default( finish_command ) def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False, useZ = False, usePNG = False ): env['CC'] = self.cc diff --git a/plugins/imagepng/plugin.cpp b/plugins/imagepng/plugin.cpp index 784500f8..3f42a8f2 100644 --- a/plugins/imagepng/plugin.cpp +++ b/plugins/imagepng/plugin.cpp @@ -63,7 +63,6 @@ extern "C" CSynapseClient * SYNAPSE_DLL_EXPORT Synapse_EnumerateInterfaces( cons g_SynapseClient.AddAPI( IMAGE_MAJOR, "png", sizeof( _QERPlugImageTable ) ); 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 ); return &g_SynapseClient;