missing rules.vc after merge

1 files changed, 10 insertions, 5 deletions

diff --git a/win/rules.vc b/win/rules.vc
index e12854d..4a3ae26 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -188,9 +188,14 @@ COMPILERFLAGS   = $(COMPILERFLAGS) -QIA64_Bx
 !endif

 !endif

 

+# Prevents "LNK1561: entry point must be defined" error compiling from VS-IDE:

+!ifndef LINKER_TESTFLAGS

+LINKER_TESTFLAGS = /DLL /NOENTRY /OUT:nmhlp-out.txt

+!endif

+

 !if "$(MACHINE)" == "IX86"

 ### test for -align:4096, when align:512 will do.

-!if [nmakehlp -l -opt:nowin98]

+!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]

 !message *** Linker has 'Win98 alignment problem'

 ALIGN98_HACK	= 1

 !else

@@ -203,7 +208,7 @@ ALIGN98_HACK	= 0
 

 LINKERFLAGS     =

 

-!if [nmakehlp -l -ltcg]

+!if [nmakehlp -l -ltcg $(LINKER_TESTFLAGS)]

 LINKERFLAGS     =-ltcg

 !endif

 

@@ -417,7 +422,7 @@ TCL_NO_DEPRECATED	    = 0
 !if [nmakehlp -f $(CHECKS) "fullwarn"]

 !message *** Doing full warnings check

 WARNINGS		    = -W4

-!if [nmakehlp -l -warn:3]

+!if [nmakehlp -l -warn:3 $(LINKER_TESTFLAGS)]

 LINKERFLAGS		    = $(LINKERFLAGS) -warn:3

 !endif

 !else

@@ -430,7 +435,7 @@ WARNINGS		    = $(WARNINGS) -Wp64
 !endif

 

 !if $(PGO) > 1

-!if [nmakehlp -l -ltcg:pgoptimize]

+!if [nmakehlp -l -ltcg:pgoptimize $(LINKER_TESTFLAGS)]

 LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pgoptimize

 !else

 MSG=^

@@ -438,7 +443,7 @@ This compiler does not support profile guided optimization.
 !error $(MSG)

 !endif

 !elseif $(PGO) > 0

-!if [nmakehlp -l -ltcg:pginstrument]

+!if [nmakehlp -l -ltcg:pginstrument $(LINKER_TESTFLAGS)]

 LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pginstrument

 !else

 MSG=^