update

Fork: 0

kei-n / libkc

Browse code update main
1 parent edc0b7a commit 3d16508212a4b14e323abaf1e5e6a59fb3ebec65 Nomura Kei authored on 16 Jul

Patch

Unified Split

Showing 5 changed files

                Ignore Space
               Show notes
              View
            
          
          15 ■■■■■
          config.mk
-#
# OS指定
#
#OS					= linux
OS					= windows
OS					= linux
#OS					= windows
 
#
# アーキテクチャ指定
#
#
# コンパイラ
#
#
#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
 
#
# オプション設定
#
ifeq ($(strip $(OS)),windows)
LIBS				?= -liphlpapi -lws2_32
LIBS				?= -lws2_32
DEBUG_OPTIONS       ?=
else
LIBS				?= -lpthread -lrt
DEBUG_OPTIONS       ?= -fstack-protector
endif
endif	
endif
 #
 # OS指定
 #
+#OS					= linux
+OS					= windows
+OS					= linux
+#OS					= windows
 #
 # アーキテクチャ指定
 #
 #
 # コンパイラ
 #
 #
+#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
 #
 # オプション設定
 #
 ifeq ($(strip $(OS)),windows)
+LIBS				?= -liphlpapi -lws2_32
+LIBS				?= -lws2_32
 DEBUG_OPTIONS       ?=
 else
 LIBS				?= -lpthread -lrt
 DEBUG_OPTIONS       ?= -fstack-protector
 endif
 endif
 endif

                Ignore Space
               Show notes
              View
            
          
          5 ■■■■■
          mk/link-a-conf.mk
 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
 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

Ignore Space Show notes View mk/link-a-rule.mk

Ignore Space Show notes View modules/Makefile

Show notes View modules/src/main.c 100644 → 0

Show line notes below