[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1610
Date       : Sun Jul 30 12:07:05 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/filters.cpp
   M /Trunk/XaraLX/wxOil/camelot.cpp

No need to remove the include as well as the ADD_FILTER to get rid of flash from 0.7
Allow xrc check generation in retail builds (it was Charles who wanted it in the first place)


Diff:
Index: Trunk/XaraLX/Kernel/filters.cpp
===================================================================
--- Trunk/XaraLX/Kernel/filters.cpp	(revision 1609)
+++ Trunk/XaraLX/Kernel/filters.cpp	(revision 1610)
@@ -145,10 +145,7 @@
 #include "filtimag.h"		// Imagemap filter
 #include "pngfiltr.h"		// for PNG filter class
 #include "imjpeg.h"			// for JPEGImportFilter
-PORTNOTE("filter","Removed Flash filter for 0.7")
-#if defined(_DEBUG)
 #include "swffiltr.h"		// For the SWF export filter.
-#endif
 //#include "extfilts.h"		// For the TIFF filter.
 #include "kerneldc.h"
 #include "xsepsops.h"
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1609)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1610)
@@ -502,12 +502,12 @@
 #if defined(_DEBUG)
 	{ wxCMD_LINE_OPTION, _T("u"), _T("user"), _T("set username for debug tracing") },
 	{ wxCMD_LINE_SWITCH, _T("m"), _T("memorycheck"), _T("check memory") },
-	{ wxCMD_LINE_SWITCH, _T("x"), _T("xrccheckgen"), _T("generate xrc.check file") },
 	{ wxCMD_LINE_OPTION, _T("l"), _T("listdebug"), _T("list debug level") , wxCMD_LINE_VAL_NUMBER },
 #endif
 	{ wxCMD_LINE_SWITCH, _T("h"), _T("help"),	_T("Display this help"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
 	{ wxCMD_LINE_SWITCH, _T("v"), _T("version"),	_T("Display the version information") },
 	{ wxCMD_LINE_OPTION, _T("r"), _T("resource"),	_T("resource directory") },
+	{ wxCMD_LINE_SWITCH, _T("x"), _T("xrccheckgen"), _T("generate xrc.check file") },
 	{ wxCMD_LINE_PARAM, NULL, NULL, _T("input file"), wxCMD_LINE_VAL_STRING, 
 										wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE },
 	{ wxCMD_LINE_NONE }


Xara