Author: hdu
Date: Mon Feb 4 17:15:02 2013
New Revision: 1442188
URL: http://svn.apache.org/viewvc?rev=1442188&view=rev
Log:
fix linker complaints about invalid security options for StaticLib targets
Modified:
openoffice/trunk/main/solenv/gbuild/platform/windows.mk
Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1442188&r1=1442187&r2=1442188&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Mon Feb 4 17:15:02
2013
@@ -190,11 +190,7 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAG
gb_LinkTarget_LDFLAGS := \
-MACHINE:IX86 \
-NODEFAULTLIB \
- -OPT:NOREF \
-SUBSYSTEM:CONSOLE \
- -safeseh \
- -nxcompat \
- -dynamicbase \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst
\,/,$(ILIB))))) \
ifneq ($(ENABLE_CRASHDUMP),)
@@ -438,7 +434,7 @@ endef
# Library class
gb_Library_DEFS := -D_DLL
-gb_Library_TARGETTYPEFLAGS := -DLL
+gb_Library_TARGETTYPEFLAGS := -DLL -OPT:NOREF -SAFESEH -NXCOMPAT -DYNAMICBASE
gb_Library_get_rpath :=
gb_Library_SYSPRE := i
@@ -588,7 +584,7 @@ endef
# Executable class
gb_Executable_EXT := .exe
-gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF
-INCREMENTAL:NO -DEBUG
+gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF
-INCREMENTAL:NO -DEBUG -SAFESEH -NXCOMPAT -DYNAMICBASE
gb_Executable_get_rpath :=
define gb_Executable_Executable_platform
