diff options
| author | Dan Gudmundsson <[email protected]> | 2011-12-10 09:50:23 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-12-10 09:50:23 +0100 |
| commit | 8d03b919f06db216a271bc90cf90d9c697a5a5c8 (patch) | |
| tree | 49dc8f7773e4ee0db65c84b8a79fdb19bad6663d /lib/wx/src/Makefile | |
| parent | f20b520b0d2d990ab70b56345b63a8b508edde1a (diff) | |
| parent | 44d21ab66987c4dc4df461901600618efd2907c3 (diff) | |
| download | otp-8d03b919f06db216a271bc90cf90d9c697a5a5c8.tar.gz otp-8d03b919f06db216a271bc90cf90d9c697a5a5c8.tar.bz2 otp-8d03b919f06db216a271bc90cf90d9c697a5a5c8.zip | |
Merge branch 'dgud/wx/behaviour-spec'
* dgud/wx/behaviour-spec:
[wx] Add handle_cast to avoid behaviour warning
[wx] Avoid missing wx_object behaviour warning
[wx] Remove warnings Add an additional cast when casting buffer offsets, to remove warnings "cast to pointer from integer of different size"
[wx] Add callback specs to wx_object
Diffstat (limited to 'lib/wx/src/Makefile')
| -rw-r--r-- | lib/wx/src/Makefile | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile index 46bc06271c..4e5971de03 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -18,7 +18,15 @@ # include ../vsn.mk -include ../config.mk +ifdef TERTIARY_BOOTSTRAP + VSN = $(WX_VSN) + INSIDE_ERLSRC = true + include $(ERL_TOP)/make/target.mk + include $(ERL_TOP)/make/$(TARGET)/otp.mk + RELSYSDIR = $(RELEASE_PATH)/lib/wx-$(VSN) +else # Normal build + include ../config.mk +endif ESRC = . EGEN = gen @@ -65,7 +73,11 @@ APPUP_SRC = $(APPUP_FILE).src APPUP_TARGET = $(EBIN)/$(APPUP_FILE) # Targets -debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) +ifdef TERTIARY_BOOTSTRAP + opt: $(EBIN)/wx_object.beam +else + debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) +endif clean: rm -f $(TARGET_FILES) |