projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added namespaces to prevent warnings with Bakefile 0.2.3
[wxWidgets.git]
/
build
/
bakefiles
/
build_cfg.bkl
diff --git
a/build/bakefiles/build_cfg.bkl
b/build/bakefiles/build_cfg.bkl
index 479c8a3c91867206d09a7a8e8c8555ae794505ea..117ea97d95896b2718cea0e17e2db87155a011c7 100644
(file)
--- a/
build/bakefiles/build_cfg.bkl
+++ b/
build/bakefiles/build_cfg.bkl
@@
-8,13
+8,17
@@
the library.
-->
the library.
-->
- <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW' and FORMAT!='msvc6prj' and FORMAT!='cbuilderx'">
+ <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj'] and
+ TOOLKIT in ['PM','MSW','MGL','MOTIF']">
+
+ <set var="BUILD_CFG_FILE" make_var="1">
+ $(SETUPHDIR)$(DIRSEP)build.cfg
+ </set>
- <set var="BUILD_CFG_FILE">$(LIBDIRNAME)$(DIRSEP)build.cfg</set>
-
<action id="build_cfg_file">
<action id="build_cfg_file">
+ <is-phony>1</is-phony>
<dependency-of>all</dependency-of>
<dependency-of>all</dependency-of>
- <depends>libdir</depends>
+ <depends>libdir
_setup
</depends>
<command>
@echo WXVER_MAJOR=$(WXVER_MAJOR) >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=$(WXVER_MINOR) >>$(BUILD_CFG_FILE)
<command>
@echo WXVER_MAJOR=$(WXVER_MAJOR) >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=$(WXVER_MINOR) >>$(BUILD_CFG_FILE)
@@
-32,17
+36,20
@@
@echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
@echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
@echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
@echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
@echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
@echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
+ @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
- @echo USE_
ODBC=$(USE_ODBC
) >>$(BUILD_CFG_FILE)
+ @echo USE_
MEDIA=$(USE_MEDIA
) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(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)
@echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)
@echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE)
@echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE)
@echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
@echo CC=$(CC) >>$(BUILD_CFG_FILE)
@echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
@echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)
@echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE)
@echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE)
- @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE)
+ @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE)
</command>
</action>
</command>
</action>