diff --git a/config.mk b/config.mk index 91965b5..9715a99 100644 --- a/config.mk +++ b/config.mk @@ -14,8 +14,8 @@ # # OS指定 # -#OS = linux -OS = windows +OS = linux +#OS = windows # # アーキテクチャ指定 @@ -33,10 +33,10 @@ # コンパイラ # # -#CC = $(CROSS_COMPILE)gcc -#CXX = $(CROSS_COMPILE)g++ -CC = $(CROSS_COMPILE)clang -CXX = $(CROSS_COMPILE)clang++ +CC = $(CROSS_COMPILE)gcc +CXX = $(CROSS_COMPILE)g++ +#CC = $(CROSS_COMPILE)clang +#CXX = $(CROSS_COMPILE)clang++ #CC = $(CROSS_COMPILE)clang-16 #CXX = $(CROSS_COMPILE)clang++16 @@ -44,7 +44,7 @@ # オプション設定 # ifeq ($(strip $(OS)),windows) -LIBS ?= -liphlpapi -lws2_32 +LIBS ?= -lws2_32 DEBUG_OPTIONS ?= else LIBS ?= -lpthread -lrt @@ -95,4 +95,3 @@ endif endif endif - diff --git a/config.mk b/config.mk index 91965b5..9715a99 100644 --- a/config.mk +++ b/config.mk @@ -14,8 +14,8 @@ # # OS指定 # -#OS = linux -OS = windows +OS = linux +#OS = windows # # アーキテクチャ指定 @@ -33,10 +33,10 @@ # コンパイラ # # -#CC = $(CROSS_COMPILE)gcc -#CXX = $(CROSS_COMPILE)g++ -CC = $(CROSS_COMPILE)clang -CXX = $(CROSS_COMPILE)clang++ +CC = $(CROSS_COMPILE)gcc +CXX = $(CROSS_COMPILE)g++ +#CC = $(CROSS_COMPILE)clang +#CXX = $(CROSS_COMPILE)clang++ #CC = $(CROSS_COMPILE)clang-16 #CXX = $(CROSS_COMPILE)clang++16 @@ -44,7 +44,7 @@ # オプション設定 # ifeq ($(strip $(OS)),windows) -LIBS ?= -liphlpapi -lws2_32 +LIBS ?= -lws2_32 DEBUG_OPTIONS ?= else LIBS ?= -lpthread -lrt @@ -95,4 +95,3 @@ endif endif endif - diff --git a/mk/link-a-conf.mk b/mk/link-a-conf.mk index 631e6d5..0e872f3 100644 --- a/mk/link-a-conf.mk +++ b/mk/link-a-conf.mk @@ -10,11 +10,8 @@ HEADER_FILES = $(wildcard include/*.h) $(wildcard include/*.hpp) TOP_HEADER_FILES = $(addprefix $(TOPDIR)/include/,$(notdir $(HEADER_FILES))) -HEADER_FILES_WIN = $(wildcard include/win/*.h) $(wildcard include/win/*.hpp) -TOP_HEADER_FILES_WIN = $(addprefix $(TOPDIR)/include/win/,$(notdir $(HEADER_FILES_WIN))) - CLEAN_FILES += $(TOP_TARGET) -CLEAN_FILES += $(TOP_HEADER_FILES) $(TOP_HEADER_FILES_WIN) +CLEAN_FILES += $(TOP_HEADER_FILES) endif endif diff --git a/config.mk b/config.mk index 91965b5..9715a99 100644 --- a/config.mk +++ b/config.mk @@ -14,8 +14,8 @@ # # OS指定 # -#OS = linux -OS = windows +OS = linux +#OS = windows # # アーキテクチャ指定 @@ -33,10 +33,10 @@ # コンパイラ # # -#CC = $(CROSS_COMPILE)gcc -#CXX = $(CROSS_COMPILE)g++ -CC = $(CROSS_COMPILE)clang -CXX = $(CROSS_COMPILE)clang++ +CC = $(CROSS_COMPILE)gcc +CXX = $(CROSS_COMPILE)g++ +#CC = $(CROSS_COMPILE)clang +#CXX = $(CROSS_COMPILE)clang++ #CC = $(CROSS_COMPILE)clang-16 #CXX = $(CROSS_COMPILE)clang++16 @@ -44,7 +44,7 @@ # オプション設定 # ifeq ($(strip $(OS)),windows) -LIBS ?= -liphlpapi -lws2_32 +LIBS ?= -lws2_32 DEBUG_OPTIONS ?= else LIBS ?= -lpthread -lrt @@ -95,4 +95,3 @@ endif endif endif - diff --git a/mk/link-a-conf.mk b/mk/link-a-conf.mk index 631e6d5..0e872f3 100644 --- a/mk/link-a-conf.mk +++ b/mk/link-a-conf.mk @@ -10,11 +10,8 @@ HEADER_FILES = $(wildcard include/*.h) $(wildcard include/*.hpp) TOP_HEADER_FILES = $(addprefix $(TOPDIR)/include/,$(notdir $(HEADER_FILES))) -HEADER_FILES_WIN = $(wildcard include/win/*.h) $(wildcard include/win/*.hpp) -TOP_HEADER_FILES_WIN = $(addprefix $(TOPDIR)/include/win/,$(notdir $(HEADER_FILES_WIN))) - CLEAN_FILES += $(TOP_TARGET) -CLEAN_FILES += $(TOP_HEADER_FILES) $(TOP_HEADER_FILES_WIN) +CLEAN_FILES += $(TOP_HEADER_FILES) endif endif diff --git a/mk/link-a-rule.mk b/mk/link-a-rule.mk index 657d858..9c233a7 100644 --- a/mk/link-a-rule.mk +++ b/mk/link-a-rule.mk @@ -10,8 +10,8 @@ $(TOP_TARGET): $(TARGET) ifneq ($(strip $(HEADER_FILES)),) $(CP) -f $(HEADER_FILES) $(TOPDIR)/include/ - $(CP) -f $(HEADER_FILES_WIN) $(TOPDIR)/include/win/ endif + -@$(MKDIR) -p $(TOPDIR)/lib/ $(CP) -f $(TARGET) $(TOPDIR)/lib/ endif diff --git a/config.mk b/config.mk index 91965b5..9715a99 100644 --- a/config.mk +++ b/config.mk @@ -14,8 +14,8 @@ # # OS指定 # -#OS = linux -OS = windows +OS = linux +#OS = windows # # アーキテクチャ指定 @@ -33,10 +33,10 @@ # コンパイラ # # -#CC = $(CROSS_COMPILE)gcc -#CXX = $(CROSS_COMPILE)g++ -CC = $(CROSS_COMPILE)clang -CXX = $(CROSS_COMPILE)clang++ +CC = $(CROSS_COMPILE)gcc +CXX = $(CROSS_COMPILE)g++ +#CC = $(CROSS_COMPILE)clang +#CXX = $(CROSS_COMPILE)clang++ #CC = $(CROSS_COMPILE)clang-16 #CXX = $(CROSS_COMPILE)clang++16 @@ -44,7 +44,7 @@ # オプション設定 # ifeq ($(strip $(OS)),windows) -LIBS ?= -liphlpapi -lws2_32 +LIBS ?= -lws2_32 DEBUG_OPTIONS ?= else LIBS ?= -lpthread -lrt @@ -95,4 +95,3 @@ endif endif endif - diff --git a/mk/link-a-conf.mk b/mk/link-a-conf.mk index 631e6d5..0e872f3 100644 --- a/mk/link-a-conf.mk +++ b/mk/link-a-conf.mk @@ -10,11 +10,8 @@ HEADER_FILES = $(wildcard include/*.h) $(wildcard include/*.hpp) TOP_HEADER_FILES = $(addprefix $(TOPDIR)/include/,$(notdir $(HEADER_FILES))) -HEADER_FILES_WIN = $(wildcard include/win/*.h) $(wildcard include/win/*.hpp) -TOP_HEADER_FILES_WIN = $(addprefix $(TOPDIR)/include/win/,$(notdir $(HEADER_FILES_WIN))) - CLEAN_FILES += $(TOP_TARGET) -CLEAN_FILES += $(TOP_HEADER_FILES) $(TOP_HEADER_FILES_WIN) +CLEAN_FILES += $(TOP_HEADER_FILES) endif endif diff --git a/mk/link-a-rule.mk b/mk/link-a-rule.mk index 657d858..9c233a7 100644 --- a/mk/link-a-rule.mk +++ b/mk/link-a-rule.mk @@ -10,8 +10,8 @@ $(TOP_TARGET): $(TARGET) ifneq ($(strip $(HEADER_FILES)),) $(CP) -f $(HEADER_FILES) $(TOPDIR)/include/ - $(CP) -f $(HEADER_FILES_WIN) $(TOPDIR)/include/win/ endif + -@$(MKDIR) -p $(TOPDIR)/lib/ $(CP) -f $(TARGET) $(TOPDIR)/lib/ endif diff --git a/modules/Makefile b/modules/Makefile index 99c9881..ab8c874 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -11,7 +11,7 @@ TOPDIR ?= .. RULEDIR ?= $(TOPDIR)/mk NAME = libkc -TARGET = $(NAME).exe +TARGET = $(NAME).a SUBDIRS = test USE_SO_VERSION = diff --git a/config.mk b/config.mk index 91965b5..9715a99 100644 --- a/config.mk +++ b/config.mk @@ -14,8 +14,8 @@ # # OS指定 # -#OS = linux -OS = windows +OS = linux +#OS = windows # # アーキテクチャ指定 @@ -33,10 +33,10 @@ # コンパイラ # # -#CC = $(CROSS_COMPILE)gcc -#CXX = $(CROSS_COMPILE)g++ -CC = $(CROSS_COMPILE)clang -CXX = $(CROSS_COMPILE)clang++ +CC = $(CROSS_COMPILE)gcc +CXX = $(CROSS_COMPILE)g++ +#CC = $(CROSS_COMPILE)clang +#CXX = $(CROSS_COMPILE)clang++ #CC = $(CROSS_COMPILE)clang-16 #CXX = $(CROSS_COMPILE)clang++16 @@ -44,7 +44,7 @@ # オプション設定 # ifeq ($(strip $(OS)),windows) -LIBS ?= -liphlpapi -lws2_32 +LIBS ?= -lws2_32 DEBUG_OPTIONS ?= else LIBS ?= -lpthread -lrt @@ -95,4 +95,3 @@ endif endif endif - diff --git a/mk/link-a-conf.mk b/mk/link-a-conf.mk index 631e6d5..0e872f3 100644 --- a/mk/link-a-conf.mk +++ b/mk/link-a-conf.mk @@ -10,11 +10,8 @@ HEADER_FILES = $(wildcard include/*.h) $(wildcard include/*.hpp) TOP_HEADER_FILES = $(addprefix $(TOPDIR)/include/,$(notdir $(HEADER_FILES))) -HEADER_FILES_WIN = $(wildcard include/win/*.h) $(wildcard include/win/*.hpp) -TOP_HEADER_FILES_WIN = $(addprefix $(TOPDIR)/include/win/,$(notdir $(HEADER_FILES_WIN))) - CLEAN_FILES += $(TOP_TARGET) -CLEAN_FILES += $(TOP_HEADER_FILES) $(TOP_HEADER_FILES_WIN) +CLEAN_FILES += $(TOP_HEADER_FILES) endif endif diff --git a/mk/link-a-rule.mk b/mk/link-a-rule.mk index 657d858..9c233a7 100644 --- a/mk/link-a-rule.mk +++ b/mk/link-a-rule.mk @@ -10,8 +10,8 @@ $(TOP_TARGET): $(TARGET) ifneq ($(strip $(HEADER_FILES)),) $(CP) -f $(HEADER_FILES) $(TOPDIR)/include/ - $(CP) -f $(HEADER_FILES_WIN) $(TOPDIR)/include/win/ endif + -@$(MKDIR) -p $(TOPDIR)/lib/ $(CP) -f $(TARGET) $(TOPDIR)/lib/ endif diff --git a/modules/Makefile b/modules/Makefile index 99c9881..ab8c874 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -11,7 +11,7 @@ TOPDIR ?= .. RULEDIR ?= $(TOPDIR)/mk NAME = libkc -TARGET = $(NAME).exe +TARGET = $(NAME).a SUBDIRS = test USE_SO_VERSION = diff --git a/modules/src/main.c b/modules/src/main.c deleted file mode 100644 index 446efe2..0000000 --- a/modules/src/main.c +++ /dev/null @@ -1,28 +0,0 @@ -#include - -#include -#include - -#ifndef UNITTEST -int main(int argc, char *argv[]) -#else -int main_exec(int argc, char *argv) -#endif -{ - KcMemory_start(true); - - UNUSED_VARIABLE(argc); - UNUSED_VARIABLE(argv); - char *buf = (char *)malloc(128); - char *buf2 = (char *)malloc(256); - UNUSED_VARIABLE(buf2); - buf[0] = 'A'; - buf[1] = '\n'; - buf[2] = '\0'; - printf("%s", buf); - assert_equals(124, 123); - assert_equals("ABC", "ABC"); - assert_equals(2.34, 2.33, 0.1); - assert_equals("\x01\x02", "\x01\x02\x03", 2); - return 0; -}