Changeset 10493 for trunk/make
- Timestamp:
- Mar 8, 2004, 8:56:56 PM (22 years ago)
- Location:
- trunk/make
- Files:
-
- 4 added
- 3 edited
-
process.mak (modified) (3 diffs)
-
setup.mak (modified) (3 diffs)
-
setup.optional.emxomfld.mk (added)
-
setup.optional.igcc.mk (added)
-
setup.os2debemxomfld.mk (added)
-
setup.os2debigcc.mk (added)
-
setup.os2ld.mk (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/make/process.mak
r10438 r10493 1 # $Id: process.mak,v 1. 39 2004-02-02 22:26:57bird Exp $1 # $Id: process.mak,v 1.40 2004-03-08 19:56:42 bird Exp $ 2 2 # 3 3 # Generic Buildsystem … … 450 450 ! if "$(TARGET_MODE)" == "DLL" 451 451 TARGET_IGNORE_LINKER_WARNINGS = 1 452 ! else 453 TARGET_IGNORE_LINKER_WARNINGS = 0 452 454 ! endif 453 455 !endif … … 1572 1574 @ \ 1573 1575 !endif 1574 !if def TARGET_IGNORE_LINKER_WARNINGS1576 !if $(TARGET_IGNORE_LINKER_WARNINGS) 1575 1577 -4 \ 1576 1578 !endif -
trunk/make/setup.mak
r10360 r10493 1 # $Id: setup.mak,v 1.2 6 2003-12-12 11:54:11bird Exp $1 # $Id: setup.mak,v 1.27 2004-03-08 19:56:42 bird Exp $ 2 2 # 3 3 # The common build setup. … … 62 62 !if "$(BUILD_ENV)" == "EMX" 63 63 SHT_BLDENV=emx 64 !endif 65 !if "$(BUILD_ENV)" == "IGCC" 66 SHT_BLDENV=igcc 64 67 !endif 65 68 !if "$(BUILD_ENV)" == "MSCV6" … … 96 99 !if "$(BUILD_ENV_FORCE)" == "EMX" 97 100 SHT_BLDENVFRC=emx 101 !endif 102 !if "$(BUILD_ENV_FORCE)" == "IGCC" 103 SHT_BLDENVFRC=igcc 98 104 !endif 99 105 !if "$(BUILD_ENV_FORCE)" == "MSCV6" -
trunk/make/setup.os2ld.mk
r9243 r10493 1 # $Id: setup.os2ld.mk,v 1. 2 2002-09-14 23:35:27bird Exp $1 # $Id: setup.os2ld.mk,v 1.3 2004-03-08 19:56:43 bird Exp $ 2 2 3 3 # … … 21 21 MAKE_INCLUDE_LD_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)link386.mk 22 22 !endif 23 !ifdef LD_USE_EMXOMFLD 24 TOOL_MAPSYM_TYPE = ILINK 25 MAKE_INCLUDE_LD_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)emxomfld.mk 26 !endif 23 27 24 28 # Use default one (for the given environment) … … 28 32 MAKE_INCLUDE_LD_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)wlink.mk 29 33 ! else 30 ! if "$(LD_FORMAT)" == "NE" 34 ! if "$(BUILD_ENV:IGCC=xxxx)" != "$(BUILD_ENV)" # (InnoTek GCC check) 35 TOOL_MAPSYM_TYPE = ILINK 36 MAKE_INCLUDE_LD_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)emxomfld.mk 37 ! else 38 ! if "$(LD_FORMAT)" == "NE" 31 39 TOOL_MAPSYM_TYPE = LINK 32 40 MAKE_INCLUDE_LD_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)link.mk 33 ! else41 ! else 34 42 TOOL_MAPSYM_TYPE = ILINK 35 43 MAKE_INCLUDE_LD_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)ilink.mk 44 ! endif 36 45 ! endif 37 46 ! endif
Note:
See TracChangeset
for help on using the changeset viewer.
