From 38ecca9b30e0fc5f7cc6264857f983e40dd58195 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 24 Jul 2015 16:22:29 +0200 Subject: inline a bunch of use-once macros no point in having a macro unless it's actually going to reduce the number of lines of code Change-Id: Ic8760d6506cf272d7bd088f7b3b4dcbf288099fc --- scp2/inc/macros.inc | 8 -------- 1 file changed, 8 deletions(-) (limited to 'scp2/inc') diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 54e5bc6c709f..86b221e57c6b 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -426,20 +426,12 @@ End #define SCP2_URE_DL_DIR GID_DIR_URE_LIB #if defined WNT #define SCP2_URE_DL_NORMAL(n) n ".dll" -#define SCP2_URE_DL_BARE(n) n ".dll" #define SCP2_URE_DL_VER(n, v) n v ".dll" -#define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll" -#define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll" #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll" #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll" #else #define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX) -#define SCP2_URE_DL_BARE(n) n STRING(UNXSUFFIX) #define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v -#define SCP2_URE_DL_COMID_VER(n, v) \ - "lib" n STRING(COMID) STRING(UNXSUFFIX) "." v -#define SCP2_URE_DL_COMID_NORMAL(n) \ - "lib" n STRING(COMID) STRING(UNXSUFFIX) #define SCP2_URE_DL_UNO_VER(n, v) "libuno_" n STRING(UNXSUFFIX) "." v #define SCP2_URE_DL_UNO_NORMAL(n) "libuno_" n STRING(UNXSUFFIX) #define SCP2_URE_DL_UNO_COMID_VER(n, v) \ -- cgit stro/cib/libreoffice-5-2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/solenv/gbuild/Executable.mk
AgeCommit message (Expand)Author
2013-11-04gbuild: remove error stubs for renamed/removed functionsMichael Stahl
2013-11-02gbuild: Executable: remove pointless indirection here tooMichael Stahl
2013-09-23Fixes for cross-compilation on OS X (to iOS)Tor Lillqvist
2013-09-23Try to fix cross-compilationTor Lillqvist
2013-09-22gbuild: add consistent directory dependencies for LinkTargetsMichael Stahl
2013-09-22gbuild: remove executables from OUTDIR and WORKDIRMichael Stahl
2013-09-22odk: remove Package_bin, instead auto-install executablesMichael Stahl
2013-09-22gbuild: remove libraries from OUTDIR and WORKDIRMichael Stahl
2013-09-22gbuild: refactor LinkTarget representationMichael Stahl
2013-09-11Towards a working instdir for Mac OS X: some LIBO_URE_BIN_FOLDER fixesStephan Bergmann
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann
2013-09-09start to use instdir for subsequentcheck tests; avoid make dev-installMatúš Kukan
2013-09-09gbuild: avoid packages when copying files into instdirMatúš Kukan