summaryrefslogtreecommitdiff
path: root/salhelper
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-10-10 10:02:29 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-10-10 10:02:45 +0100
commit168bd09c6bf2e27b108325899c995bc330f7f640 (patch)
treed708c0c4ff6b16c1ca223438eb6cacd2f3b3afe4 /salhelper
parent77cb1ca382520f52b9a87d13f8a1a511e5554946 (diff)
try and make mingw32 build
Change-Id: I64c884b6d14c7112a88c7741ef7688108ec80ffe
Diffstat (limited to 'salhelper')
-rw-r--r--salhelper/CppunitTest_salhelper_testapi.mk2
-rw-r--r--salhelper/qa/makefile.mk43
-rw-r--r--salhelper/qa/version.map24
3 files changed, 1 insertions, 68 deletions
diff --git a/salhelper/CppunitTest_salhelper_testapi.mk b/salhelper/CppunitTest_salhelper_testapi.mk
index ae8004264285..606827a868d7 100644
--- a/salhelper/CppunitTest_salhelper_testapi.mk
+++ b/salhelper/CppunitTest_salhelper_testapi.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_CppunitTest_set_include,salhelper_testapi,\
$(eval $(call gb_CppunitTest_use_libraries,salhelper_testapi,\
salhelper \
sal \
- $(gb_STDLIBS) \
+ $(gb_UWINAPI) \
))
# vim: set noet sw=4 ts=4:
diff --git a/salhelper/qa/makefile.mk b/salhelper/qa/makefile.mk
deleted file mode 100644
index c359a4603eed..000000000000
--- a/salhelper/qa/makefile.mk
+++ /dev/null
@@ -1,43 +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 := salhelper
-TARGET := qa
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_api.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB)
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1VERSIONMAP = version.map
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
- cd $(SHL1TARGETN:d) && $(TESTSHL2) $(SHL1TARGETN:f)
diff --git a/salhelper/qa/version.map b/salhelper/qa/version.map
deleted file mode 100644
index 878fdc5ee97f..000000000000
--- a/salhelper/qa/version.map
+++ /dev/null
@@ -1,24 +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 .
-#
-
-UDK_3_0_0 {
- global:
- registerAllTestFunction;
- local:
- *;
-};