Skip to content

Commit

Permalink
make.rules.mak cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
mtrojnar committed Jan 19, 2016
1 parent ee82e1e commit 2a21022
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 1 addition & 3 deletions make.rules.mak
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\static\libeay32MT$(DEBUG_SUFFIX).lib

LIBS = $(OPENSSL_LIB) user32.lib advapi32.lib crypt32.lib gdi32.lib

CFLAGS = /nologo /GS /W3 /D_CRT_SECURE_NO_DEPRECATE /MT$(DEBUG_SUFFIX) $(OPENSSL_INC) /D_WIN32_WINNT=0x0502 /DWIN32_LEAN_AND_MEAN $(DEBUG_COMPILE)
CLFLAGS = /nologo /GS /W3 /D_CRT_SECURE_NO_DEPRECATE /MT$(DEBUG_SUFFIX) $(OPENSSL_INC) /D_WIN32_WINNT=0x0502 /DWIN32_LEAN_AND_MEAN $(DEBUG_COMPILE)

LINKFLAGS = /NOLOGO /INCREMENTAL:NO $(MACHINE) /MANIFEST:NO /NXCOMPAT /DYNAMICBASE $(DEBUG_LINK)

LIBFLAGS = /NOLOGO $(MACHINE)
3 changes: 1 addition & 2 deletions src/Makefile.mak
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ versioninfo.res: versioninfo.rc
rc $(RSC_PROJ) versioninfo.rc

.c.obj::
cl $(CFLAGS) /c $<
cl $(CLFLAGS) /c $<

$(TARGET): $(OBJECTS) versioninfo.res
echo LIBRARY $* > $*.def
Expand All @@ -25,4 +25,3 @@ $(TARGET): $(OBJECTS) versioninfo.res
link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) \
$(OBJECTS) $(LIBS) versioninfo.res
if EXIST $*.dll.manifest mt -manifest $*.dll.manifest -outputresource:$*.dll;2

0 comments on commit 2a21022

Please sign in to comment.