[Libreoffice-commits] .: 3 commits - basic/inc basic/StaticLibrary_app.mk basic/StaticLibrary_sample.mk solenv/gbuild
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Aug 24 06:07:31 PDT 2011
basic/StaticLibrary_app.mk | 4 ----
basic/StaticLibrary_sample.mk | 4 ----
basic/inc/basic/mybasic.hxx | 4 ++--
basic/inc/basic/process.hxx | 6 +++---
basic/inc/basic/testtool.hxx | 4 ++--
solenv/gbuild/platform/windows.mk | 27 ++++++++++++++++++---------
6 files changed, 25 insertions(+), 24 deletions(-)
New commits:
commit 9ba447cec165946ed8b9e719c4a9ee318f9b051b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 24 16:04:05 2011 +0300
No DLL stuff needed here as these go into static libs
diff --git a/basic/inc/basic/mybasic.hxx b/basic/inc/basic/mybasic.hxx
index ffc35b6..ad7df51 100644
--- a/basic/inc/basic/mybasic.hxx
+++ b/basic/inc/basic/mybasic.hxx
@@ -41,7 +41,7 @@ class ErrorEntry;
#define SBXCR_TEST 0x54534554 // TEST
//-----------------------------------------------------------------------------
-class BASIC_DLLPUBLIC BasicError {
+class BasicError {
AppBasEd* pWin;
sal_uInt16 nLine, nCol1, nCol2;
String aText;
@@ -51,7 +51,7 @@ public:
};
//-----------------------------------------------------------------------------
-class BASIC_DLLPUBLIC MyBasic : public StarBASIC
+class MyBasic : public StarBASIC
{
SbError nError;
virtual sal_Bool ErrorHdl();
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
index f1f6018..8c63f53 100644
--- a/basic/inc/basic/process.hxx
+++ b/basic/inc/basic/process.hxx
@@ -38,7 +38,7 @@
typedef std::map< String, String > Environment;
typedef Environment::value_type EnvironmentVariable;
-class BASIC_DLLPUBLIC Process
+class Process
{
// Internal members and methods
sal_uInt32 m_nArgumentCount;
@@ -47,8 +47,8 @@ class BASIC_DLLPUBLIC Process
rtl_uString **m_pEnvList;
rtl::OUString m_aProcessName;
oslProcess m_pProcess;
- BASIC_DLLPRIVATE sal_Bool ImplIsRunning();
- BASIC_DLLPRIVATE long ImplGetExitCode();
+ sal_Bool ImplIsRunning();
+ long ImplGetExitCode();
sal_Bool bWasGPF;
sal_Bool bHasBeenStarted;
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index 13e8216..ab79f54 100644
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -42,7 +42,7 @@
// Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
// this routine became necessary
-BASIC_DLLPUBLIC sal_Bool IsTTSignatureForUnicodeTextfile( String aLine );
+sal_Bool IsTTSignatureForUnicodeTextfile( String aLine );
#define ADD_ERROR_QUIET(nNr, aStr) \
{ \
@@ -130,7 +130,7 @@ public:
#define TT_EXECUTION_SHOW_ACTION 0x03
#define TT_EXECUTION_HIDE_ACTION 0x04
-class BASIC_DLLPUBLIC TTExecutionStatusHint : public SfxSimpleHint
+class TTExecutionStatusHint : public SfxSimpleHint
{
private:
sal_uInt16 mnType;
commit ef262d7074b08e2e0d49957c4f8c2a3aeb947cc8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 24 16:03:21 2011 +0300
Don't define BASIC_DLLIMPLEMENTATION when building static libs
diff --git a/basic/StaticLibrary_app.mk b/basic/StaticLibrary_app.mk
index c48dfe5..15b7c17 100644
--- a/basic/StaticLibrary_app.mk
+++ b/basic/StaticLibrary_app.mk
@@ -44,10 +44,6 @@ $(eval $(call gb_StaticLibrary_add_api,app,\
offapi \
))
-$(eval $(call gb_StaticLibrary_add_defs,app,\
- -DBASIC_DLLIMPLEMENTATION \
-))
-
$(eval $(call gb_StaticLibrary_add_exception_objects,app,\
basic/source/app/appbased \
basic/source/app/app \
diff --git a/basic/StaticLibrary_sample.mk b/basic/StaticLibrary_sample.mk
index e5645ad..b48ff08 100644
--- a/basic/StaticLibrary_sample.mk
+++ b/basic/StaticLibrary_sample.mk
@@ -43,10 +43,6 @@ $(eval $(call gb_StaticLibrary_add_api,sample,\
offapi \
))
-$(eval $(call gb_StaticLibrary_add_defs,sample,\
- -DBASIC_DLLIMPLEMENTATION \
-))
-
$(eval $(call gb_StaticLibrary_add_exception_objects,sample,\
basic/source/sample/collelem \
basic/source/sample/object \
commit 350b0e46bd1812d82cf5ea3988d451a079a7d35a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 24 15:47:57 2011 +0300
Don't use flags that make sense only for EXEs/DLLs when building static LIBs
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 9e05916..fbed875 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -199,17 +199,12 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
gb_LinkTarget_LDFLAGS := \
-MACHINE:IX86 \
- -OPT:NOREF \
- -safeseh \
- -nxcompat \
- -dynamicbase \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
gb_DEBUG_CFLAGS := -Zi
# this does not use CFLAGS so it is not overridable
ifneq ($(ENABLE_CRASHDUMP),)
-gb_LinkTarget_LDFLAGS += -DEBUG
gb_CFLAGS+=-Zi
gb_CXXFLAGS+=-Zi
endif
@@ -218,7 +213,6 @@ ifeq ($(gb_SYMBOL),$(true))
endif
ifneq ($(gb_DEBUGLEVEL),0)
-gb_LinkTarget_LDFLAGS += -DEBUG
gb_COMPILEROPTFLAGS :=
else
gb_COMPILEROPTFLAGS := -Ob1 -Oxs -Oy-
@@ -395,16 +389,30 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
$(LIBS) \
- $(if $(gb_PRODUCT),,oldnames.lib msvcrtd.lib msvcprtd.lib kernel32.lib user32.lib) \
+ $(if $(DLLTARGET),$(if $(gb_PRODUCT),,oldnames.lib msvcrtd.lib msvcprtd.lib kernel32.lib user32.lib)) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
endef
+# Flags common for PE executables (EXEs and DLLs)
+gb_Windows_PE_TARGETTYPEFLAGS := \
+ -release \
+ -opt:noref \
+ -incremental:no \
+ -debug \
+ -safeseh \
+ -nxcompat \
+ -dynamicbase \
+
# Library class
+
gb_Library_DEFS := -D_DLL
-gb_Library_TARGETTYPEFLAGS := -DLL
+gb_Library_TARGETTYPEFLAGS := \
+ -DLL \
+ $(gb_Windows_PE_TARGETTYPEFLAGS)
+
gb_Library_get_rpath :=
gb_Library_SYSPRE := i
@@ -554,7 +562,8 @@ endef
# Executable class
gb_Executable_EXT := .exe
-gb_Executable_TARGETTYPEFLAGS := -RELEASE -OPT:NOREF -INCREMENTAL:NO -DEBUG
+gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS)
+
gb_Executable_get_rpath :=
gb_Executable_TARGETGUI :=
More information about the Libreoffice-commits
mailing list