diff --git a/Makefile.sharp b/Makefile.sharp index 1780152..762787f 100644 --- a/Makefile.sharp +++ b/Makefile.sharp @@ -1,32 +1,29 @@ -# OPENSSL_DIR = ../openssl-1.0.0-beta2 -OPENSSL_DIR = ../openssl-0.9.8k -SFMT_DIR = ../SFMT-src-1.3.3 +# Linux 上でビルドする場合は、DEV_CYGWINをコメントアウトしてください。 +DEV_CYGWIN = TRUE -USE_SFMT = TRUE +TARGET = gen_id - - -TARGET = gen_id - -SRCS = main.c cr_generate_id.c cr_alloc.c cr_gen_id_rsa_key_priv.c cr_gen_id_rsa_key_pub.c $(SFMT_DIR)/SFMT.c +SRCS = main.c OBJS = $(notdir $(SRCS:.c=.o)) -CC := C:/Cygwin/bin/gcc +ifeq ($(DEV_CYGWIN),TRUE) -CFLAGS = -mno-cygwin -Wall +CC := C:/Cygwin/bin/gcc +LD = C:/Cygwin/bin/gcc +CFLAGS += -mno-cygwin -DDEV_CYGWIN -Wall -I./ +LDFLAGS += -Wl,--subsystem,console -mwindows -mno-cygwin -L./ +LDLIBS += -l_gen_id -ifeq ($(USE_SFMT),TRUE) -CFLAGS += -DUSE_SFMT -DMEXP=216091 -msse2 -DHAVE_SSE2 -endif +else # DEV_CYGWIN -CPPFLAGS= -I. -I$(OPENSSL_DIR)/include -I$(OPENSSL_DIR)/crypto/ec -I$(SFMT_DIR) - -LD = C:/Cygwin/bin/gcc -LDFLAGS = -Wl,--subsystem,console -mwindows -mno-cygwin -L$(OPENSSL_DIR) -LDLIBS = -lcrypto -lssl +CC := /usr/bin/gcc +LD = /usr/bin/gcc +LDFLAGS += -Wl -L./ +LDLIBS += -ldl -lnsl -l_gen_id +endif # DEV_CYGWIN .SUFFIXES: @@ -35,11 +32,6 @@ all: $(TARGET) $(TARGET): $(OBJS) $(LD) $(LDFLAGS) $(OBJS) -o $@ $(LDLIBS) -$(OBJS): $(HEADS) Makefile - -%.o:$(SFMT_DIR)/%.c - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - %.o:%.c $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ diff --git a/main.c b/main.c index 9a5cccf..fec6f57 100644 --- a/main.c +++ b/main.c @@ -5,7 +5,6 @@ #include #include #include -#include #ifdef DEV_CYGWIN #include