diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-29 07:49:48 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-29 07:49:48 +0000 |
| commit | 93d0c78ca8659f5e68d527e25725802cae8037e5 (patch) | |
| tree | 6b0d00534d8102347f2e530e83fcfc7509cac875 /solenv/inc/tg_app.mk | |
| parent | a154077661027620b6e439d801bb96660553fbea (diff) | |
INTEGRATION: CWS winregclean1 (1.48.38); FILE MERGED
2005/04/21 11:10:12 hjs 1.48.38.3: #121920# fixed hardcoded number in usage
2005/04/21 11:04:49 hjs 1.48.38.2: #121920# arg... fixed typo
2005/04/21 09:29:11 hjs 1.48.38.1: #121920# pass APPnPRODUCTNAME to windows native resources linked to the application
Diffstat (limited to 'solenv/inc/tg_app.mk')
| -rw-r--r-- | solenv/inc/tg_app.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index ee76384b3137..144d2d6b4f5a 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_app.mk,v $ # -# $Revision: 1.48 $ +# $Revision: 1.49 $ # -# last change: $Author: obo $ $Date: 2005-03-18 10:21:27 $ +# last change: $Author: obo $ $Date: 2005-04-29 08:49:48 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -132,6 +132,10 @@ USE_APP$(TNR)DEF= .IF "$(APP$(TNR)TARGETN)"!="" +.IF "$(APP$(TNR)PRODUCTNAME)"!="" +APP$(TNR)PRODUCTDEF:=-DPRODUCT_NAME="$(APP$(TNR)PRODUCTNAME)" +.ENDIF # "$(APP$(TNR)PRODUCTNAME)"!="" + .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" $(MISC)$/$(APP$(TNR)TARGET)_linkinc.ls .PHONY: @@ -200,7 +204,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc @-+echo $(EMQ)#include $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc .ENDIF # "$(APP$(TNR)VERINFO)" != "" - $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc + $(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc .ENDIF # "$(APP$(TNR)LINKRES)" != "" .IF "$(linkinc)" == "" $(APP$(TNR)LINKER) @$(mktmp \ |