mirrors/discount
2
0
Fork 0
mirror of https://github.com/Orc/discount.git synced 2026-09-25 04:10:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Hand-resolve a conflict in the msvc Makefile

Browse Source
This commit is contained in:
david parsons
2017-03-25 06:03:08 -07:00
parent eb15c58616
commit ac425bc85d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
msvc/Makefile
-4
View File
@@ -1,9 +1,5 @@
# NMAKE Makefile to build Discount with Visual C++
<<<<<<< HEAD:msvc/Makefile
CFLAGS = /nologo /MP /MD /EHa /Zi \
=======
CFLAGS = /nologo /MP /MDd /EHa /Zi \
>>>>>>> gethopt-uber-alles:msvc/Makefile
/D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_WARNINGS \
/I.
LIBOBJ = mkdio.obj markdown.obj dumptree.obj generate.obj \