Patch #1465 2006-09-08 17:06

sethjackson

wxWidgets wizard fix
Download
1465-wxWidgets_wiza.patch (1.1 KB)
Category
Application::Bugfix
Status
Accepted
Close date
2006-11-22 22:27
Assigned to
mortenmacfly
Index: src/plugins/scriptedwizard/resources/wxwidgets/wizard.script
===================================================================
--- src/plugins/scriptedwizard/resources/wxwidgets/wizard.script    (revision 2963)
+++ src/plugins/scriptedwizard/resources/wxwidgets/wizard.script    (working copy)
@@ -116,7 +116,9 @@
         }
 
         if (IsDLL)
-            lib = lib + _T("dll");
+            lib = lib + _T("dll");
+        else
+            lib = lib + _T("lib");
 
         lib = lib + Configuration;
 
@@ -226,8 +228,12 @@
         project.AddIncludeDir(libdir);
         project.AddIncludeDir(WxPath + _T("/contrib/include"));
         project.AddLibDir(LibPath);
-        project.AddLinkLib(LibName);
-        project.AddLinkLib(_T("gdi32"));
+        project.AddLinkLib(LibName);
+        project.AddLinkLib(_T("comctl32"));
+        project.AddLinkLib(_T("gdi32"));
+        project.AddLinkLib(_T("ole32"));
+        project.AddLinkLib(_T("oleaut32"));
+        project.AddLinkLib(_T("uuid"));
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc*")))
         {
             project.AddCompilerOption(_T("/D__WXMSW__"));
sethjackson 2006-09-08 17:06
mortenmacfly 2006-11-22 22:27

Applied in r3254. Thanks!