diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-16 16:25:27 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-16 16:26:03 +0200 |
| commit | bb5bdbbdca966c03e6b22b455630381154cb6d01 (patch) | |
| tree | e742242194c16bb1f2572a7bdbd6b81424654367 /solenv | |
| parent | 10890bcd4205c82cf79170a61ca5efbb277f8c09 (diff) | |
Revert "Trying to chop out the uwinapi library"
This reverts commit 2dea0dab4fafda3c10a5bd03ad15ed39a4658b51.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/wntgcci.mk | 9 | ||||
| -rw-r--r-- | solenv/inc/wntmsc.mk | 9 |
4 files changed, 14 insertions, 8 deletions
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 6951a20808b7..203ed8120fcf 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -177,6 +177,7 @@ gb_CXXFLAGS := \ -Zm500 \ gb_STDLIBS := \ + uwinapi \ advapi32 \ ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) @@ -444,6 +445,7 @@ gb_Library_PLAINLIBS_NONE += \ unicows \ user32 \ uuid \ + uwinapi \ version \ winmm \ winspool \ diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index fca6ebe3c0f6..18d71bdd4b73 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -136,6 +136,7 @@ gb_COMPILERNOOPTFLAGS := -O0 gb_STDLIBS := \ mingwthrd \ mingw32 \ + uwinapi \ mingwex \ @@ -456,6 +457,7 @@ gb_Library_PLAINLIBS_NONE += \ unicows \ user32 \ uuid \ + uwinapi \ winmm \ version \ winspool \ diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index 39c44170efe6..24b7e4e058c8 100644 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -119,6 +119,7 @@ LINKFLAGSDEBUG=-g LINKFLAGSOPT= STDLIBCPP=-lstdc++ +UWINAPILIB*=$(DYNAMIC) -luwinapi .IF "$(MINGW_SHARED_GCCLIB)"=="YES" && "$(DYNAMIC_CRT)"!="" MINGW_LIBGCC=-lgcc_s -lgcc @@ -145,10 +146,10 @@ STDLIBCUIMT+=-lmingwthrd STDSHLGUIMT+=-lmingwthrd STDSHLCUIMT+=-lmingwthrd .ENDIF -STDLIBGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt -STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt -STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt -STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt +STDLIBGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt +STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt +STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt +STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt LIBMGR=$(AR) LIBFLAGS=-rsu diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index b85518a4807b..41c1ea51c801 100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -277,6 +277,7 @@ LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /NODEFAULTLIB LINKFLAGSDEBUG=-DEBUG LINKFLAGSOPT= +UWINAPILIB*=uwinapi.lib .IF "$(DYNAMIC_CRT)"!="" .IF "$(USE_DEBUG_RUNTIME)" != "" LIBCMT=msvcrtd.lib @@ -303,10 +304,10 @@ STDSLOGUI= STDOBJCUI= STDSLOCUI= -STDLIBGUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib -STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib -STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib -STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib +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 LIBMGR=lib $(NOLOGO) IMPLIB=lib |