second merge of the 2.2 branch (RL)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -79,9 +79,6 @@ LIBTARGET=$(WXLIB)
|
||||
DUMMYOBJ=$D\dummy.obj
|
||||
!endif
|
||||
|
||||
# Please set these according to the settings in setup.h, so we can include
|
||||
# the appropriate libraries in wx.lib
|
||||
|
||||
# This one overrides the others, to be consistent with the settings in setup.h
|
||||
MINIMAL_WXWINDOWS_SETUP=0
|
||||
|
||||
@@ -89,6 +86,9 @@ PERIPH_LIBS=
|
||||
PERIPH_TARGET=
|
||||
PERIPH_CLEAN_TARGET=
|
||||
|
||||
# Set to 0 if not using GLCanvas (only affects DLL build)
|
||||
USE_GLCANVAS=1
|
||||
|
||||
# These are absolute paths, so that the compiler
|
||||
# generates correct __FILE__ symbols for debugging.
|
||||
# Otherwise you don't be able to double-click on a memory
|
||||
|
Reference in New Issue
Block a user