os2.mk (7fcdd55b) | os2.mk (44c25570) |
---|---|
1#************************************************************************* 2# 3# Licensed to the Apache Software Foundation (ASF) under one 4# or more contributor license agreements. See the NOTICE file 5# distributed with this work for additional information 6# regarding copyright ownership. The ASF licenses this file 7# to you under the Apache License, Version 2.0 (the 8# "License"); you may not use this file except in compliance --- 323 unchanged lines hidden (view full) --- 332 $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ 333 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \ 334 $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ 335 $(LDFLAGS) \ 336 @$${RESPONSEFILE} \ 337 $(if $(DLLTARGET), $(DLLDEF8)) \ 338 $(NATIVERES) \ 339 $(patsubst %.lib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \ | 1#************************************************************************* 2# 3# Licensed to the Apache Software Foundation (ASF) under one 4# or more contributor license agreements. See the NOTICE file 5# distributed with this work for additional information 6# regarding copyright ownership. The ASF licenses this file 7# to you under the Apache License, Version 2.0 (the 8# "License"); you may not use this file except in compliance --- 323 unchanged lines hidden (view full) --- 332 $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ 333 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \ 334 $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ 335 $(LDFLAGS) \ 336 @$${RESPONSEFILE} \ 337 $(if $(DLLTARGET), $(DLLDEF8)) \ 338 $(NATIVERES) \ 339 $(patsubst %.lib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \ |
340 $(patsubst %,-l%,$(EXTERNAL_LIBS)) \ |
|
340 $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ 341 $(if $(DLLTARGET),-o $(DLLTARGET8), -o $(1) ); \ 342 RC=$$?; rm $${RESPONSEFILE} \ 343 $(if $(DLLTARGET),; emximp -p2048 -o $(1) $(DLLTARGET8) ) \ 344 $(if $(DLLTARGET),; cp -p $(DLLTARGET8) $(DLLTARGET)) \ 345 $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC) 346endef 347 --- 326 unchanged lines hidden --- | 341 $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ 342 $(if $(DLLTARGET),-o $(DLLTARGET8), -o $(1) ); \ 343 RC=$$?; rm $${RESPONSEFILE} \ 344 $(if $(DLLTARGET),; emximp -p2048 -o $(1) $(DLLTARGET8) ) \ 345 $(if $(DLLTARGET),; cp -p $(DLLTARGET8) $(DLLTARGET)) \ 346 $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC) 347endef 348 --- 326 unchanged lines hidden --- |