summaryrefslogtreecommitdiff
path: root/setup_native/source/win32/customactions/regpatchactivex
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-02-07 19:17:22 -0500
committerDavid Ostrovsky <David.Ostrovsky@gmx.de>2013-02-09 20:41:19 +0000
commit4261757fc6dd17811296842cc16f507be400652e (patch)
tree429ea17bb0b1d2e7afcbca5c6cb81972dc22b962 /setup_native/source/win32/customactions/regpatchactivex
parent803137f4715ee7ab127a9718ca213db252193398 (diff)
convert setup_native to gbuild and add to tail_build
Change-Id: Ie12338dada22c59d55d89ed9611bb1a958b04223 Reviewed-on: https://gerrit.libreoffice.org/2063 Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de> Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'setup_native/source/win32/customactions/regpatchactivex')
-rw-r--r--setup_native/source/win32/customactions/regpatchactivex/exports.dxp1
-rw-r--r--setup_native/source/win32/customactions/regpatchactivex/makefile.mk78
-rw-r--r--setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx2
3 files changed, 1 insertions, 80 deletions
diff --git a/setup_native/source/win32/customactions/regpatchactivex/exports.dxp b/setup_native/source/win32/customactions/regpatchactivex/exports.dxp
deleted file mode 100644
index c1d75133584b..000000000000
--- a/setup_native/source/win32/customactions/regpatchactivex/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-PatchActiveXControl
diff --git a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
deleted file mode 100644
index cbc2652efbb6..000000000000
--- a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..$/..$/..
-PRJNAME=setup_native
-TARGET=regpatchactivex
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : settings.mk
-
-.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
-
-STDSHL=
-
-# --- Files --------------------------------------------------------
-
-INCPRE+=.\Include
-.DIRCACHE=NO
-
-SLOFILES = $(SLO)$/regpatchactivex.obj
-
-.IF "$(COM)"=="GCC"
-SHL1STDLIBS += -lstdc++
-.IF "$(MINGW_GCCLIB_EH)"=="YES"
-SHL1STDLIBS += -lgcc_eh
-.ENDIF
-SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt
-.ELSE
-SHL1STDLIBS=
-.ENDIF
-
-SHL1STDLIBS+= $(KERNEL32LIB)\
- $(USER32LIB)\
- $(ADVAPI32LIB)\
- $(SHELL32LIB)\
- $(MSILIB)
-.IF "$(COM)"!="GCC"
-SHL1STDLIBS+= libcmt.lib
-.ENDIF
-
-
-SHL1LIBS = $(SLB)$/$(TARGET).lib
-
-SHL1TARGET = $(TARGET)
-SHL1IMPLIB = i$(TARGET)
-
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-SHL1DEPN = $(SLB)$/$(TARGET).lib
-SHL1BASE = 0x1c000000
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-.ENDIF
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
-# -------------------------------------------------------------------------
diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
index 0c51ccb8f97e..c0945b7380b3 100644
--- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
+++ b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
@@ -80,7 +80,7 @@ BOOL MakeInstallForAllUsers( MSIHANDLE hMSI )
}
//----------------------------------------------------------
-extern "C" UINT __stdcall PatchActiveXControl( MSIHANDLE hMSI )
+extern "C" __declspec(dllexport) UINT __stdcall PatchActiveXControl( MSIHANDLE hMSI )
{
// MessageBox(NULL, L"PatchActiveXControl", L"Information", MB_OK | MB_ICONINFORMATION);