diff options
| author | Dan Gudmundsson <[email protected]> | 2010-11-26 15:10:27 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2010-11-26 15:10:27 +0100 |
| commit | 8339345b4e7e0b2f6520af9ecf512c7a8e538276 (patch) | |
| tree | 0f165c27fcd9ce0b3a367c2284ce2a992e6c2d2b /lib/wx/Makefile | |
| parent | 99a28d961d2d760e98353b55991f1fc51dee06b0 (diff) | |
| parent | abc92a6f3b4615e596992eda153da0c09a3c7cbf (diff) | |
| download | otp-8339345b4e7e0b2f6520af9ecf512c7a8e538276.tar.gz otp-8339345b4e7e0b2f6520af9ecf512c7a8e538276.tar.bz2 otp-8339345b4e7e0b2f6520af9ecf512c7a8e538276.zip | |
Merge branch 'dgud/wx/separate-opengl' into dev
* dgud/wx/separate-opengl:
Fix non available opengl functions
Add lib paths for *bsd variants
Initilize opengl after setCurrent
Update to OpenGL 4.1
Remove ostype sub dirs below wx/priv
Windows and Mac build issues
Add dialyser spec
Better make dependecies for api generation
Split opengl functionality into separate dynamic library
Diffstat (limited to 'lib/wx/Makefile')
| -rw-r--r-- | lib/wx/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/Makefile b/lib/wx/Makefile index 83f545b662..0bc89e08ad 100644 --- a/lib/wx/Makefile +++ b/lib/wx/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2008-2009. All Rights Reserved. +# Copyright Ericsson AB 2008-2010. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -23,7 +23,7 @@ SUBDIRS = src ifeq ($(CAN_BUILD_DRIVER), true) SUBDIRS += c_src endif -SUBDIRS += examples demos doc/src +SUBDIRS += examples doc/src CLEANDIRS = $(SUBDIRS) api_gen ifeq ($(INSIDE_ERLSRC),true) |