Remove USE_GDIPLUS setting from bakefiles.
GDI+ DLL is always loaded dynamically at runtime, so there's no reason to link against it anymore. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -42,7 +42,6 @@
|
||||
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
|
||||
@echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
|
||||
@echo CC=$(CC) >>$(BUILD_CFG_FILE)
|
||||
@echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
|
||||
|
||||
@@ -301,14 +301,6 @@
|
||||
<set var="CAIRO_INCLUDEDIR">
|
||||
<if cond="USE_CAIRO=='1'">$(DOLLAR)(CAIRO_ROOT)/include/cairo</if>
|
||||
</set>
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
<set var="GDIPLUS_LIB">
|
||||
<if cond="USE_GDIPLUS=='1'">gdiplus</if>
|
||||
</set>
|
||||
<set var="GFXCTX_DEFINE">
|
||||
<if cond="USE_GDIPLUS=='1'">wxUSE_GRAPHICS_CONTEXT=1</if>
|
||||
</set>
|
||||
</if>
|
||||
|
||||
<set var="LINK_TARGET_CPU">
|
||||
<if cond="TARGET_CPU=='amd64'">/MACHINE:X64</if>
|
||||
@@ -507,7 +499,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
<define>$(THREAD_DEFINE)</define>
|
||||
<define>$(UNICODE_DEFINE)</define>
|
||||
<define>$(MSLU_DEFINE)</define>
|
||||
<if cond="FORMAT!='autoconf'"><define>$(GFXCTX_DEFINE)</define></if>
|
||||
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
|
||||
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
|
||||
<include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>
|
||||
@@ -556,7 +547,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
<!-- system libraries on windows: -->
|
||||
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
|
||||
<sys-lib>$(UNICOWS_LIB)</sys-lib>
|
||||
<sys-lib>$(GDIPLUS_LIB)</sys-lib>
|
||||
<sys-lib>$(CAIRO_LIB)</sys-lib>
|
||||
<lib-path>$(CAIRO_LIBDIR)</lib-path>
|
||||
<if cond="FORMAT=='borland'">
|
||||
|
||||
@@ -309,16 +309,6 @@ Default is to use debug CRT if and only if BUILD==debug.
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
<option name="USE_GDIPLUS">
|
||||
<values>0,1</values>
|
||||
<default-value>0</default-value>
|
||||
<description>
|
||||
Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT)
|
||||
</description>
|
||||
</option>
|
||||
</if>
|
||||
|
||||
<option name="OFFICIAL_BUILD">
|
||||
<values>0,1</values>
|
||||
<default-value>0</default-value>
|
||||
@@ -500,7 +490,6 @@ Set the version of your Mingw installation here.
|
||||
<set var="USE_RTTI">1</set>
|
||||
<set var="USE_THREADS">1</set>
|
||||
<set var="USE_CAIRO">0</set>
|
||||
<if cond="FORMAT!='autoconf'"><set var="USE_GDIPLUS">0</set></if>
|
||||
<set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
|
||||
<set var="DEBUG_FLAG">default</set>
|
||||
<set var="MSLU">0</set>
|
||||
|
||||
Reference in New Issue
Block a user