[Libreoffice-commits] .: solenv/gbuild solenv/inc

[Fridrich Strba]

 solenv/gbuild/platform/windows.mk |    4 +++-
 solenv/inc/wntmsc.mk              |   28 +++++-----------------------
 2 files changed, 8 insertions(+), 24 deletions(-)

New commits:
commit 248b88150b99c1212a1bc5730ece9f19823f584b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Mar 22 13:20:04 2011 +0100

    Another attempt at linking on windows

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 90d33d0..9b2a92d 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -60,6 +60,8 @@ gb_COMPILERDEFS := \
 	-D_CRT_NONSTDC_NO_DEPRECATE \
 	-D_CRT_SECURE_NO_DEPRECATE \
 	-D_MT \
+	-D_DLL \
+	-MD \
 	-DBOOST_MEM_FN_ENABLE_CDECL \
 	-DCPPU_ENV=msci \
 	-DFULL_DESK \
@@ -182,7 +184,7 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
 
 gb_LinkTarget_LDFLAGS := \
 	-MACHINE:IX86 \
-	-MD \
+	-DLL \
 	-OPT:NOREF \
 	-SUBSYSTEM:CONSOLE \
 	-safeseh \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 70c0e27..f801b8f 100755
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -289,29 +289,11 @@ LINKFLAGSAPPCUI=/SUBSYSTEM:CONSOLE /BASE:0x1b000000
 LINKFLAGSSHLCUI=/SUBSYSTEM:CONSOLE /DLL
 LINKFLAGSTACK=/STACK:
 LINKFLAGSPROF=/DEBUG:mapped,partial /DEBUGTYPE:coff cap.lib
-LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /MD
+LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /DLL
 LINKFLAGSDEBUG=-DEBUG
 LINKFLAGSOPT=
 
 UWINAPILIB*=uwinapi.lib
-.IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-LIBCMT=msvcrtd.lib
-LIBCPMT=msvcprtd.lib
-.ELSE  # "$(USE_DEBUG_RUNTIME)" != ""
-LIBCMT=msvcrt.lib
-LIBCPMT=msvcprt.lib
-.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
-.ELSE # "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-LIBCMT=libcmtd.lib
-LIBCPMT=libcpmtd.lib
-CDEFS+=-D_DEBUG
-.ELSE  # "$(USE_DEBUG_RUNTIME)" != ""
-LIBCMT=libcmt.lib
-LIBCPMT=libcpmt.lib
-.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
-.ENDIF # "$(DYNAMIC_CRT)"!=""
 
 STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=
@@ -319,10 +301,10 @@ STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
 
-STDLIBGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDLIBGUIMT=$(UWINAPILIB)
+STDLIBCUIMT=$(UWINAPILIB)
+STDSHLGUIMT=$(UWINAPILIB)
+STDSHLCUIMT=$(UWINAPILIB)
 
 LIBMGR=lib $(NOLOGO)
 IMPLIB=lib