diff options
| author | Patrik Nyblom <[email protected]> | 2011-11-18 20:48:37 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-11-18 20:48:50 +0100 |
| commit | de1dc9682e8c6c56e03d5deb20019ff98d0b569a (patch) | |
| tree | 589fe4242e9a9564eaf7419188ed10e461004f85 /lib/wx/c_src | |
| parent | 49052a3d7422e0e776a8df83fa3d8280686cab0f (diff) | |
| parent | 8bbf9f0fdaf572af53892e14c282e0e73a5eea13 (diff) | |
| download | otp-de1dc9682e8c6c56e03d5deb20019ff98d0b569a.tar.gz otp-de1dc9682e8c6c56e03d5deb20019ff98d0b569a.tar.bz2 otp-de1dc9682e8c6c56e03d5deb20019ff98d0b569a.zip | |
Merge branch 'pan/osx_gcc_fixes'
* pan/osx_gcc_fixes:
Fix typo in erts/configure.in
Make OTP build w/alternative gcc on MacOS Lion
OTP-9712
Diffstat (limited to 'lib/wx/c_src')
| -rw-r--r-- | lib/wx/c_src/Makefile.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in index 69418f62ef..ae5a149d14 100644 --- a/lib/wx/c_src/Makefile.in +++ b/lib/wx/c_src/Makefile.in @@ -31,6 +31,8 @@ override TYPE=opt endif SO_EXT = @SO_EXT@ +OBJC_CC=@OBJC_CC@ +OBJC_CFLAGS=@OBJC_CFLAGS@ GENERAL = wxe_driver wxe_ps_init wxe_impl wxePrintout wxe_return wxe_gl GENERAL_H = wxe_driver.h wxe_impl.h wxe_return.h @@ -116,6 +118,7 @@ endif GL_LIBS = @GL_LIBS@ CC_O = $(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) # Targets @@ -152,6 +155,10 @@ $(SYS_TYPE)/%.o: %.c 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 $@ + $(SYS_TYPE)/%.o: gen/%.cpp mkdir -p $(SYS_TYPE) $(CPP_O) $< -o $@ |