Changeset 086b882f304981fefb256190e4c18d3fa3a6bd40
- Timestamp:
- 20/11/05 17:41:21
(3 years ago)
- Author:
- Gildas Bazin <gbazin@videolan.org>
- git-committer:
- Gildas Bazin <gbazin@videolan.org> 1132504881 +0000
- git-parent:
[933e35601ce52a8960bb1eb093bb4e688f44911b]
- git-author:
- Gildas Bazin <gbazin@videolan.org> 1132504881 +0000
- Message:
* extras/contrib/bootstrap, extras/contrib/src/Makefile: more cygwin fixes.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r7ee6cf1 |
r086b882 |
|
| 52 | 52 | CC="${HOST}-gcc" |
|---|
| 53 | 53 | CXX="${HOST}-g++" |
|---|
| | 54 | LD="${HOST}-ld" |
|---|
| 54 | 55 | RANLIB="${HOST}-ranlib" |
|---|
| 55 | 56 | AR="${HOST}-ar" |
|---|
| … | … | |
| 119 | 120 | echo "CC = ${CC}" >> config.mak |
|---|
| 120 | 121 | echo "CXX = ${CXX}" >> config.mak |
|---|
| | 122 | echo "LD = ${LD}" >> config.mak |
|---|
| 121 | 123 | echo "RANLIB = ${RANLIB}" >> config.mak |
|---|
| 122 | 124 | echo "AR = ${AR}" >> config.mak |
|---|
| r7ee6cf1 |
r086b882 |
|
| 55 | 55 | HOSTCC+= CXX="$(CXX)" |
|---|
| 56 | 56 | endif |
|---|
| | 57 | ifneq ($(LD),) |
|---|
| | 58 | HOSTCC+= LD="$(LD)" |
|---|
| | 59 | endif |
|---|
| 57 | 60 | ifneq ($(RANLIB),) |
|---|
| 58 | 61 | HOSTCC+= RANLIB="$(RANLIB)" |
|---|
| … | … | |
| 72 | 75 | FFMPEGCONF=--cross-prefix=$(HOST)- |
|---|
| 73 | 76 | X264CONF=--crosscompile=$(HOST) |
|---|
| 74 | | endif |
|---|
| 75 | | |
|---|
| 76 | | ifneq ($(BUILD),$(HOST)) |
|---|
| 77 | | LIVECC=C_COMPILER=$(HOST)-gcc CPP=$(HOST)-cpp CPLUSPLUS_COMPILER=$(HOST)-g++ LINK="$(HOST)-g++ -o" LIBRARY_LINK="$(HOST)-ld -o" |
|---|
| 78 | 77 | endif |
|---|
| 79 | 78 | |
|---|
| … | … | |
| 961 | 960 | else |
|---|
| 962 | 961 | ifdef HAVE_WIN32 |
|---|
| 963 | | (cd $<;./genMakefiles mingw && make |
|---|
| | 962 | (cd $<;./genMakefiles mingw && make $(HOSTCC)) |
|---|
| 964 | 963 | else |
|---|
| 965 | 964 | (cd $<; ./genMakefiles macosx && make ) |
|---|
