X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c88a264a08a023e9544b684fd2dc28e8dd7b1c7d..4b6a582bef796b43ad4cf0a96bd40bfd631460c6:/build/bakefiles/common.bkl
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 89080fa27e..ceea7fb5e0 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -145,6 +145,9 @@
$(mk.evalExpr(wxwin.mkLibName('aui')))
+
+ $(mk.evalExpr(wxwin.mkLibName('propgrid')))
+
$(mk.evalExpr(wxwin.mkLibName('richtext')))
@@ -354,20 +357,6 @@ InputPath=..\..\include\wx\%s
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
-
-
-
- FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE
-
-
-Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\..\include\wx\%s
-
-"$(SETUPHDIR)\wx\setup.h" : "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
-$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
-
-
-
@@ -426,19 +415,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
-
-
-
- FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE
-
-
-Creating $(SETUPHDIR)\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(SETUPHDIR)\wx\msw"
-$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
-
-
@@ -570,6 +546,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
rpcrt4
advapi32
wsock32
+
+ wininet
oleacc
@@ -658,8 +637,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
$(RCDEFDIR)
$(TOP_SRCDIR)include
+ $(DYLIB_RPATH_POSTLINK)
$(WXTOPDIR)src/msw/version.rc
+