-LIBS_NOGUI = ['xml', 'net', 'odbc']
-LIBS_GUI = ['core', 'adv', 'html', 'gl', 'dbgrid']
+LIBS_NOGUI = ['xml', 'net']
+LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media',
+ 'aui', 'richtext', 'stc']
+# Additional libraries that must be linked in:
+EXTRALIBS = {
+ 'gl' : '$(EXTRALIBS_OPENGL)',
+ 'xml' : '$(EXTRALIBS_XML)',
+ 'html' : '$(EXTRALIBS_HTML)',
+ 'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
+ 'media' : '$(EXTRALIBS_MEDIA)',
+}