You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2013/02/25 15:30:46 UTC
svn commit: r1449720 -
/openoffice/trunk/main/extensions/source/activex/main/makefile.mk
Author: jsc
Date: Mon Feb 25 14:30:46 2013
New Revision: 1449720
URL: http://svn.apache.org/r1449720
Log:
#121456# ifdef atlthunk.lib
Modified:
openoffice/trunk/main/extensions/source/activex/main/makefile.mk
Modified: openoffice/trunk/main/extensions/source/activex/main/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/activex/main/makefile.mk?rev=1449720&r1=1449719&r2=1449720&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/activex/main/makefile.mk (original)
+++ openoffice/trunk/main/extensions/source/activex/main/makefile.mk Mon Feb 25 14:30:46 2013
@@ -137,8 +137,10 @@ SHL1STDLIBS_X64+=\
SHL1OBJS_X64=$(SLOFILES_X64)
SHL1DEF_X64=$(TARGET).def
-SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atls.lib $(ATL_LIB_X64)$/atlthunk.lib
-
+SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atls.lib
+.IF "$(HAVE_ATLTHUNK)" == "YES"
+ SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atlthunk.lib
+.ENDIF
.ENDIF # "$(BUILD_X64)"!=""
# --- Targets ----------------------------------