X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e06a429949d1a0cc279f4efb320211d349c3e093..68c675a6185129c2c174622ed718a77371b7e3f5:/build/bakefiles/common.bkl
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 1326b68471..ef3900a40b 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -22,6 +22,9 @@
0
+
+ 0
+
@@ -145,6 +148,9 @@
$(mk.evalExpr(wxwin.mkLibName('net')))
+
+ $(mk.evalExpr(wxwin.mkLibName('qa')))
+
$(mk.evalExpr(wxwin.mkLibName('core')))
@@ -235,7 +241,8 @@
off
- $(DEBUGINFO)
+ on
+ off
off
on
@@ -247,6 +254,24 @@
on
off
+
+ on
+ off
+
+
+ multi
+ single
+
+
+
+ wxNO_RTTI
+
+
+ wxNO_EXCEPTIONS
+
+
+ wxNO_THREADS
+
__WXDEBUG__
@@ -274,9 +299,9 @@
$(DEBUGINFO)
$(DEBUGRUNTIME)
$(OPTIMIZEFLAG)
- multi
+ $(THREADSFLAG)
$(RUNTIME_LIBS)
- $(EXCEPTIONSFLAG)
+ $(RTTIFLAG)
$(EXCEPTIONSFLAG)
$(EXTRACFLAGS)
@@ -312,9 +337,17 @@
-
- $(addPrefixToList('include\', wxwin.headersOnly(value)))
-
+
+
+
+ $(addPrefixToList('include\', wxwin.headersOnly(value)))
+
+
+
+
+ $(addPrefixToList('include\\', wxwin.headersOnly(value)))
+
+
@@ -383,6 +416,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
__WX$(TOOLKIT)__
$(WXUNIV_DEFINE)
$(DEBUG_DEFINE)
+ $(EXCEPTIONS_DEFINE)
+ $(RTTI_DEFINE)
+ $(THREAD_DEFINE)
$(UNICODE_DEFINE)
@@ -477,7 +513,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
$(WXLIBNAME)
-
+
$(WXTOPDIR)src/msw/dummy.cpp
$(WXTOPDIR)src/msw/dummy.cpp
@@ -489,8 +525,6 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
wxprec_$(id)
src/common/extended.c
- src/msw/gsocket.cpp
- src/msw/gsockmsw.cpp
@@ -515,6 +549,15 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
$(WX_VERSION)
$(WXSOVERSION)
$(WXMACVERSION)
+
+
+
+ WXDLLNAME=$(WXDLLNAME)
+
+ $(TOP_SRCDIR)include
+
+
+ $(WXTOPDIR)src/msw/version.rc