X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c59422a40f0a3b11d6c38993f09b3a36b30f8322..f0e5d5d22ce012e9312a63175d79c0f4a8d444be:/build/bakefiles/common.bkl
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 38c6d80e9b..8948042f2b 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -187,7 +187,7 @@
$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG)
-
$(COMPILER)
@@ -301,14 +301,6 @@
$(DOLLAR)(CAIRO_ROOT)/include/cairo
-
-
- gdiplus
-
-
- wxUSE_GRAPHICS_CONTEXT=1
-
-
/MACHINE:X64
@@ -384,7 +376,14 @@
-
+
+Creating $(SETUPHDIR)\wx\setup.h
+InputPath=..\..\include\wx\%s
+
+"$(SETUPHDIR)\wx\setup.h" :
+$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+
+
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\..\include\wx\%s
@@ -507,7 +506,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
$(THREAD_DEFINE)
$(UNICODE_DEFINE)
$(MSLU_DEFINE)
- $(GFXCTX_DEFINE)
$(SETUPHDIR)
$(TOP_SRCDIR)include
$(CAIRO_INCLUDEDIR)
@@ -556,7 +554,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
$(UNICOWS_LIB)
- $(GDIPLUS_LIB)
$(CAIRO_LIB)
$(CAIRO_LIBDIR)
@@ -604,10 +601,16 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
$(EXTRALIBS_FOR_GUI)
+
+ $(LIB_PNG)
+
-
+
$(WXLIB_MONO)
+ $(LIB_PNG_IF_MONO)