diff options
| author | Henrik Nord <[email protected]> | 2013-12-02 15:51:11 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2013-12-02 15:51:11 +0100 |
| commit | 471abeb72af964049fcd3ed169d1bca7c5534d4c (patch) | |
| tree | 62a18a1780b71aa285b44e703501587ded10ea05 /lib/wx | |
| parent | 026a9226fcd47d29870f5b5d879919ce4f60d785 (diff) | |
| parent | 25b992335e82919d6166b860c9b97710c5f33ae1 (diff) | |
| download | otp-471abeb72af964049fcd3ed169d1bca7c5534d4c.tar.gz otp-471abeb72af964049fcd3ed169d1bca7c5534d4c.tar.bz2 otp-471abeb72af964049fcd3ed169d1bca7c5534d4c.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/wx')
| -rw-r--r-- | lib/wx/c_src/Makefile.in | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in index 1d17076d23..5507a74c14 100644 --- a/lib/wx/c_src/Makefile.in +++ b/lib/wx/c_src/Makefile.in @@ -46,6 +46,7 @@ HAVE_OPENGL = true OPENGL_F = gl_funcs egl_impl include $(ERL_TOP)/make/target.mk +include $(ERL_TOP)/make/output.mk include $(ERL_TOP)/make/$(TARGET)/otp_ded.mk ERL_INCS= $(DED_INCLUDES) @@ -107,9 +108,9 @@ endif GL_LIBS = @GL_LIBS@ -CC_O = $(CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS) +CC_O = $(V_CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS) OBJC_CC_O = $(OBJC_CC) -c $(CFLAGS) $(OBJC_CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS) -CPP_O = $(CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS) +CPP_O = $(V_CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS) # Targets @@ -138,36 +139,36 @@ $(GL_OBJECTS): $(GL_H) $(WX_OBJECTS): $(GENERATED_H) $(GENERAL_H) $(SYS_TYPE)/%.o: %.cpp - mkdir -p $(SYS_TYPE) + $(V_at)mkdir -p $(SYS_TYPE) $(CPP_O) $< -o $@ $(SYS_TYPE)/%.o: %.c - mkdir -p $(SYS_TYPE) + $(V_at)mkdir -p $(SYS_TYPE) $(CC_O) $< -o $@ $(SYS_TYPE)/wxe_ps_init.o: wxe_ps_init.c - mkdir -p $(SYS_TYPE) - $(OBJC_CC_O) $< -o $@ + $(V_at)mkdir -p $(SYS_TYPE) + $(cc_verbose)$(OBJC_CC_O) $< -o $@ $(SYS_TYPE)/%.o: gen/%.cpp - mkdir -p $(SYS_TYPE) + $(V_at)mkdir -p $(SYS_TYPE) $(CPP_O) $< -o $@ $(SYS_TYPE)/%.o: gen/%.c - mkdir -p $(SYS_TYPE) + $(V_at)mkdir -p $(SYS_TYPE) $(CC_O) $< -o $@ $(SYS_TYPE)/wxe_win32.$(RC_FILE_EXT): wxe_win32.rc - mkdir -p $(SYS_TYPE) + $(V_at)mkdir -p $(SYS_TYPE) $(RESCOMP) -o $@ $< $(TARGET_DIR)/wxe_driver$(SO_EXT): $(WX_OBJECTS) - mkdir -p $(TARGET_DIR) - $(LD) $(LDFLAGS) $(WX_OBJECTS) $(WX_LIBS) -o $@ + $(V_at)mkdir -p $(TARGET_DIR) + $(V_LD) $(LDFLAGS) $(WX_OBJECTS) $(WX_LIBS) -o $@ $(TARGET_DIR)/erl_gl$(SO_EXT): $(GL_OBJECTS) - mkdir -p $(TARGET_DIR) - $(CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@ + $(V_at)mkdir -p $(TARGET_DIR) + $(V_CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@ # ---------------------------------------------------- |