projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.
[wxWidgets.git]
/
samples
/
wrapsizer
/
makefile.unx
diff --git
a/samples/wrapsizer/makefile.unx
b/samples/wrapsizer/makefile.unx
index 50991052d9326ed79fd03d0dc111d5eac69a6fb3..181705ee37cfde713ada38f023494ce20e442a70 100644
(file)
--- a/
samples/wrapsizer/makefile.unx
+++ b/
samples/wrapsizer/makefile.unx
@@
-1,6
+1,6
@@
# =========================================================================
# This makefile was generated by
# =========================================================================
# This makefile was generated by
-# Bakefile 0.2.
6
(http://www.bakefile.org)
+# Bakefile 0.2.
9
(http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
# Do not modify, all changes will be overwritten!
# =========================================================================
@@
-25,7
+25,7
@@
LDFLAGS ?=
# Location and arguments of wx-config script
WX_CONFIG ?= wx-config
# Location and arguments of wx-config script
WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,
mgl,mac
,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,
osx_cocoa,osx_carbon
,dfb]
WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
# Use DLL build of wx library to use? [0,1]
WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
# Use DLL build of wx library to use? [0,1]