Skip to content
This repository was archived by the owner on Mar 26, 2022. It is now read-only.

conditionally include cgywin 64bit link library #16

Open
zyonet wants to merge 2 commits into
base: master
Choose a base branch
from
Open

conditionally include cgywin 64bit link library #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c44e576
conditionally include 64bit cygwin library
Oct 9, 2018
4999ac2
add .gitignore
Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
################################################################################
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
################################################################################

*.o
/config
/.vs
/configure-stamp
/cntlm.exe
/cntlm-0.93beta5
/cntlm-0.93beta5-win32.exe
9 changes: 8 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,15 @@ NAME := cntlm
CC := gcc
VER := $(shell cat VERSION)
OS := $(shell uname -s)
CYGARCH := $(shell uname -a)
OSLDFLAGS := $(shell [ $(OS) = "SunOS" ] && echo "-lrt -lsocket -lnsl")
LDFLAGS := -lpthread $(OSLDFLAGS)
CYGWIN_REQS := cygwin1.dll cyggcc_s-1.dll cygstdc++-6.dll cygrunsrv.exe

ifeq ($(findstring x86_64,$(CYGARCH)),)
CYGWIN_REQS := cygwin1.dll cyggcc_s-1.dll cygstdc++-6.dll cygrunsrv.exe
else
CYGWIN_REQS := cygwin1.dll cyggcc_s-seh-1.dll cygstdc++-6.dll cygrunsrv.exe
endif

ifeq ($(DEBUG),1)
CFLAGS += -g -std=c99 -Wall -pedantic -D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -DVERSION=\"'$(VER)'\"
Expand All @@ -33,6 +39,7 @@ else
endif

$(NAME): configure-stamp $(OBJS)
@echo $(CYGARCH)
@echo "Linking $@"
@$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)

Expand Down