<makefile>
- <requires version="0.1.7"/>
+ <requires version="0.2.1"/>
<!-- bakefile modules we need: -->
<using module="datafiles"/>
<set var="WXLIB_DBGRID">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
</set>
+ <set var="WXLIB_AUI">
+ <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
+ </set>
+ <set var="WXLIB_RICHTEXT">
+ <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
+ </set>
+ <set var="WXLIB_STC">
+ <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
+ </set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
<set var="CFG_NAME_PART">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
</set>
+
+ <!-- NB: this is make_var so that it can be overriden on command line
+ like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 -->
+ <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
+
<set var="OBJS" make_var="1">
- <if cond="FORMAT!='cbuilderx'">
- $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
- </if>
- <!-- FIXME: waiting for removal after CBX has better ../ dirs
- support -->
- <if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
+ $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
</set>
<set var="BUILDDIR">$(OBJS)</set>
</set>
<set var="LIBDIRNAME" make_var="1">
- <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
+ <if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
<if cond="FORMAT!='autoconf'">
- $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+ $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
</if>
</set>
<if cond="MSLU=='1'">unicows</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:AMD64</if>
<if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
<!-- deal with the need to copy setup.h here: -->
- <set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
+ <set var="IS_MSVC_PRJ">
+ $(FORMAT in ['msvc6prj','msevc4prj','msvs2005prj'])
+ </set>
<define-tag name="msvc-headers" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
- <!-- FIXME: remove this once we require >=bkl-0.1.9 -->
- <if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
- <msvc-project-files>
- $(addPrefixToList('include\', wxwin.headersOnly(value)))
- </msvc-project-files>
- </if>
- <if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
- <msvc-project-files>
- $(addPrefixToList('include\\', wxwin.headersOnly(value)))
- </msvc-project-files>
- </if>
+ <msvc-project-files>
+ $(addPrefixToList('include\\', wxwin.headersOnly(value)))
+ </msvc-project-files>
</if>
</define-tag>
<set var="msvc_copy_setup_h_script">
<if cond="IS_MSVC_PRJ">
Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\include\wx\%s
+InputPath=..\..\include\wx\%s
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</set>
<set var="_custom_build_include_wx_msw_genrcdefs_h">
Creating $(SETUPHDIR)\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
-"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw"
+"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
</set>
</if>
<include file="tiff.bkl"/>
<include file="odbc.bkl"/>
<include file="expat.bkl"/>
+ <include file="scintilla.bkl"/>
<!-- =============================================================== -->
<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>
<lib-path>$(LIBDIRNAME)</lib-path>
<lib-path>$(MGLLIBPATH)</lib-path>
<lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
</if>
+
<warnings>max</warnings>
+ <cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>
<cppflags-watcom>
-wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
-wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
+ <sys-lib>$(GDIPLUS_LIB)</sys-lib>
<if cond="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib>
</if>
<set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
<libname>$(WXLIBNAME)</libname>
+ <define>WXBUILDING</define>
+
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
<sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
<ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
<!-- version info resources: -->
- <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
- <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
- <if cond="FORMAT=='autoconf'">
- <res-include>$(RCDEFDIR)</res-include>
- <res-include>$(TOP_SRCDIR)include</res-include>
- </if>
+ <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
+ <if cond="FORMAT=='autoconf'">
+ <res-include>$(RCDEFDIR)</res-include>
+ <res-include>$(TOP_SRCDIR)include</res-include>
</if>
<win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
</template>
<depends>wxtiff</depends>
<depends>wxjpeg</depends>
<depends>wxpng</depends>
+ <depends>wxscintilla</depends>
</template>
<template id="wx_3rdparty_dependencies"
projects / wxWidgets.git / blobdiff