summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapnadkarni <apnmbx-wits@yahoo.com>2017-09-30 14:15:38 (GMT)
committerapnadkarni <apnmbx-wits@yahoo.com>2017-09-30 14:15:38 (GMT)
commita9ffd83357bd55f9491d521013a1cf1573848611 (patch)
tree23970a585f05e9958773636ff4dd4a3a7661bfa4
parent3c1ac2213e945f31d0afed1b3145e6d58a47363e (diff)
downloadtk-vc_reform.zip
tk-vc_reform.tar.gz
tk-vc_reform.tar.bz2
Need netapi.lib for static buildsvc_reform
-rw-r--r--win/makefile.vc17
1 files changed, 3 insertions, 14 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 115d4bd..e1cad48 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -407,7 +407,7 @@ CONFIG_DEFS =-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
PRJ_DEFINES = -DBUILD_ttk $(CONFIG_DEFS) -Dinline=__inline -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE
# Additional Link libraries needed beyond those in rules.vc
-PRJ_LIBS = gdi32.lib user32.lib userenv.lib
+PRJ_LIBS = netapi32.lib gdi32.lib user32.lib userenv.lib
#---------------------------------------------------------------------
@@ -501,27 +501,16 @@ dbgshell: setup $(WISH)
!endif
windbg $(WISH)
-setup:
- @if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
- @if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)
-
!if !$(STATIC_BUILD)
$(TKIMPLIB): $(TKLIB)
!endif
$(TKLIB): $(TKOBJS)
-!if $(STATIC_BUILD)
- $(MAKELIBCMD) @<<
-$**
-<<
-!else
- $(MAKEDLLCMD) @<<
+ $(MAKEBINCMD) @<<
$**
<<
$(_VC_MANIFEST_EMBED_DLL)
- -@del $*.exp
-!endif
-
+ @if exist $*.exp del $*.exp
$(TKSTUBLIB): $(TKSTUBOBJS)
$(MAKELIBCMD) -nodefaultlib $**