Commit: 6e18b682b374ad7657422393815968ba692f56af - garakutas (git)

Commit MetaInfo

• Revision: 6e18b682b374ad7657422393815968ba692f56af (tree)
• Time: 2023-02-14 20:32:32
• Author: tarancho <tfuruka1@nift...>
• Commiter: tarancho

Log Message

なんとなく cmake に移行中。まだ、makefileは残しています。

Change Summary

• add: src/CMakeLists.txt
• add: src/CPU100/CMakeLists.txt
• modified: src/CPU100/main.c
• modified: src/CPU100/makefile
• add: src/ExSleep/CMakeLists.txt
• add: src/MegaFile/CMakeLists.txt
• add: src/TVMaker/CMakeLists.txt
• modified: src/TVMaker/main.c
• delete: src/TVMaker/test.c
• add: src/batkey/CMakeLists.txt
• modified: src/batkey/main.c
• modified: src/batkey/makefile
• add: src/crlf/CMakeLists.txt
• modified: src/crlf/main.c
• modified: src/crlf/makefile
• add: src/dedup/CMakeLists.txt
• add: src/img2java/CMakeLists.txt
• add: src/lha32/CMakeLists.txt
• modified: src/lha32/main.c
• add: src/pi/CMakeLists.txt
• add: src/tee/CMakeLists.txt
• modified: src/tee/main.c
• modified: src/tee/makefile
• add: src/wlsfonts/CMakeLists.txt
• modified: src/wlsfonts/main.c

Incremental Difference

--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required (VERSION 3.10)
+
+project(garakuta C)
+
+add_subdirectory(batkey)
+add_subdirectory(CPU100)
+add_subdirectory(crlf)
+add_subdirectory(dedup)
+add_subdirectory(ExSleep)
+add_subdirectory(img2java)
+add_subdirectory(lha32)
+add_subdirectory(MegaFile)
+add_subdirectory(TVMaker)
+add_subdirectory(pi)
+add_subdirectory(tee)
+add_subdirectory(wlsfonts)

--- /dev/null
+++ b/src/CPU100/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(cpu100 C)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --exec-charset=cp932")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --input-charset=utf-8")
+
+add_executable(cpu100.exe main.c)

--- a/src/CPU100/main.c
+++ b/src/CPU100/main.c
@@ -125,7 +125,7 @@ selfLoop()
     LONGLONG ftUser;
 
     HANDLE lpLib = LoadLibrary("kernel32.dll");
-    printf("Library Handle: %lx\n", (ULONG) lpLib);
+    printf("Library Handle: %llx\n", (ULONGLONG) lpLib);
     if (!lpLib) {
         return;
     }

--- a/src/CPU100/makefile
+++ b/src/CPU100/makefile
@@ -3,8 +3,8 @@
 CC = x86_64-w64-mingw32-gcc
 STRIP = x86_64-w64-mingw32-strip
 
-CC = i686-w64-mingw32-gcc
-STRIP = i686-w64-mingw32-strip
+#CC = i686-w64-mingw32-gcc
+#STRIP = i686-w64-mingw32-strip
 
 CFLAGS=-g -Wall --exec-charset=cp932 --input-charset=utf-8
 

--- /dev/null
+++ b/src/ExSleep/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(ExSleep C)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --exec-charset=cp932")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --input-charset=utf-8")
+
+add_executable(ExSleep.exe main.c)

--- /dev/null
+++ b/src/MegaFile/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(MegaFile C)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --exec-charset=cp932")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --input-charset=utf-8")
+
+add_executable(MegaFile.exe main.c)

--- /dev/null
+++ b/src/TVMaker/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(tvmaker C)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --exec-charset=cp932")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --input-charset=utf-8")
+
+add_executable(tvmaker.exe main.c)

--- a/src/TVMaker/main.c
+++ b/src/TVMaker/main.c
@@ -27,6 +27,9 @@ main(int argc, char *argv[])
     char szVirus[] = "Y6P\"Q&ABQ\5]Q[Y65)Q_*8DD*8~%FJDBS."
         "TUBOEBSE.BOUJWJSVT.UFTU.GJMF\"%I,I+";
 
+    (void) argc;
+    (void) argv;
+    
     printf("EICAR準拠 Virus Test File %s [Build:"
            __DATE__ " " __TIME__ "]\n", VERSION);
 

--- a/src/TVMaker/test.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <stdio.h>
-
-#define TV_CODE1 "X5O!P%@AP[4\\PZX54(P^)7CC)7}$"
-#define TV_CODE2 "EICAR-STANDARD-ANTIVIRUS-TEST-FILE"
-#define TV_CODE3 "!$H+H*"
-
-static void
-easyEncript(char *str)
-{
-    char *p = str;
-
-    printf("[");
-    while (*p) {
-        printf("%c", ((int) *p) + 1);
-        p++;
-    }
-    printf("]\n");
-}
-
-int
-main()
-{
-    char szVirus[] = TV_CODE1 TV_CODE2 TV_CODE3;
-
-    easyEncript(szVirus);
-}

--- /dev/null
+++ b/src/batkey/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(batkey C)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --exec-charset=cp932")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --input-charset=utf-8")
+
+add_executable(batkey.exe main.c)

--- a/src/batkey/main.c
+++ b/src/batkey/main.c
@@ -34,11 +34,10 @@ GetCh()
 static void
 Usage()
 {
-    // 可能=可\x94\x5c、表示=\x95\x5c示
     fprintf(stderr, "$Id: main.c,v 1.1 2006/11/15 12:08:04 tfuruka1 Exp $\n"
             "Usage: betkey <KeyLists> <Message>\n\n"
-            "KeyLists 入力可\x94\x5cな入力文字を羅列します。\n"
-            "Message  \x95\x5c示するメッセージ\n"
+            "KeyLists 入力可能な入力文字を羅列します。\n"
+            "Message  表示するメッセージ\n"
             "\n"
             "入力された文字のKeyListsの添字(0 align)を返却します。\n"
             "標準入力は使用できません。必ずコンソールから入力する\n"
@@ -67,8 +66,8 @@ int main(int argc, char *argv[])
     printf(":");
     fflush(stdout);
 
-    while (!(p = strchr(argv[1], c = GetCh())));
+    while (!(p = strchr(argv[1], c = (char) GetCh())));
     printf(" [%c]\n", c);
 
-    return (int)((ULONG)p - (ULONG)argv[1]);
+    return (int)((ULONGLONG)p - (ULONGLONG)argv[1]);
 }

--- a/src/batkey/makefile
+++ b/src/batkey/makefile
@@ -13,7 +13,7 @@
 include version
 
 CC = x86_64-w64-mingw32-gcc
-CC = i686-w64-mingw32-gcc
+#CC = i686-w64-mingw32-gcc
 CFLAGS=-g -Wall --exec-charset=cp932 --input-charset=utf-8
 
 O = o

--- /dev/null
+++ b/src/crlf/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(crlf C)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --exec-charset=cp932")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --input-charset=utf-8")
+
+add_executable(crlf.exe main.c)

--- a/src/crlf/main.c
+++ b/src/crlf/main.c
@@ -131,7 +131,7 @@ main(int argc, char *argv[])
                 continue;
             }
 
-            if (!(lpBuf = (LPTSTR) malloc(stat.st_size + 1))) {
+            if (!(lpBuf = (LPTSTR) malloc((size_t) stat.st_size + 1))) {
                 fprintf(stderr, "メモリ不足です。\n");
                 ret++;
                 continue;
@@ -143,11 +143,11 @@ main(int argc, char *argv[])
                 ret++;
                 continue;
             }
-            size = fread(lpBuf, 1, stat.st_size, fp);
+            size = fread(lpBuf, 1, (size_t) stat.st_size, fp);
             if (size != (size_t) stat.st_size) {
                 fprintf(stderr, "入力ファイルを最後迄読み込めません。\n"
                         "\tファイルサイズ: %ld\n"
-                        "\t読み込みサイズ: %u\n", stat.st_size, size);
+                        "\t読み込みサイズ: %llu\n", stat.st_size, size);
                 free(lpBuf);
                 fclose(fp);
                 ret++;

--- a/src/crlf/makefile
+++ b/src/crlf/makefile
@@ -12,8 +12,10 @@ EXE=crlf.exe
 OBJS=main.o
 
 CC = x86_64-w64-mingw32-gcc
-CC = i686-w64-mingw32-gcc
-CFLAGS=-g -Wall --exec-charset=cp932 --input-charset=utf-8
+# CC = i686-w64-mingw32-gcc
+CFLAGS=-g -Wall -W -Wformat=2 -Wcast-qual -Wcast-align -Wwrite-strings \
+	-Wconversion -Wfloat-equal -Wpointer-arith \
+	--exec-charset=cp932 --input-charset=utf-8
 
 ../../bin/$(EXE) : ../../bin $(EXE)
 	-cp $(EXE) $@

--- /dev/null
+++ b/src/dedup/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(dedup C)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --exec-charset=cp932")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --input-charset=utf-8")
+
+add_executable(dedup.exe main.c)

--- /dev/null
+++ b/src/img2java/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(img2java C)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --exec-charset=cp932")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --input-charset=utf-8")
+
+add_executable(img2java.exe main.c)

--- /dev/null
+++ b/src/lha32/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(lha32 C)
+
+set(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../../work/UNLHA32)
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../../work/UNLHA32)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --exec-charset=cp932")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --input-charset=utf-8")
+
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -l UNLHA32")
+
+add_executable(lha32.exe main.c)
+target_link_libraries(lha32.exe UNLHA32)

--- a/src/lha32/main.c
+++ b/src/lha32/main.c
@@ -28,6 +28,9 @@ main(int argc, char *argv[])
     int ret;
     LPTSTR lpszBuf = malloc(BUF_SIZE + 1);
     LPTSTR p = strchr(GetCommandLine(), ' ');
+    char pTemp[] = "";
+
+    (void) argv;
 
     printf("%s(Version %1g.%1g)\n", VERSION,
            (double)UnlhaGetVersion() / 100,
@@ -47,7 +50,7 @@ main(int argc, char *argv[])
     if (p) {
         p++;
     } else {
-        p = "";
+        p = pTemp;
     }
 
     ret = Unlha(NULL, p, lpszBuf, BUF_SIZE);

--- /dev/null
+++ b/src/pi/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(pi C)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+
+message(${CMAKE_C_FLAGS})
+add_executable(pi.exe main.c)

--- /dev/null
+++ b/src/tee/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(tee C)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --exec-charset=cp932")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --input-charset=utf-8")
+
+add_executable(tee.exe main.c)

--- a/src/tee/main.c
+++ b/src/tee/main.c
@@ -32,8 +32,8 @@
 
 typedef struct _list {
     struct _list *next;
-    int fd;     /* ファイル記述子 */
-    char *name; /* argvから取得したファイル名 */
+    int fd;                           /* ファイル記述子 */
+    const char *name;                 /* argvから取得したファイル名 */
 } LIST;
 LIST *head;
 
@@ -66,14 +66,14 @@ showHelp()
 }
 
 static void
-err(int exitCode, char *msg)
+err(int exitCode, const char *msg)
 {
     fprintf(stderr, "%s\n", msg);
     exit(exitCode);
 }
 
 static void
-warn(char *lpFmt, ...)
+warn(const char *lpFmt, ...)
 {
     va_list args;                               // 引数展開用
 
@@ -86,12 +86,12 @@ warn(char *lpFmt, ...)
 }
 
 void
-add(int fd, char *name)
+add(int fd, const char *name)
 {
     LIST *p;
 
     if ((p = malloc((size_t)sizeof(LIST))) == NULL) {
-        err(1, "malloc");
+        err(1, (const char *) "malloc");
     }
     p->fd = fd;
     p->name = name;
@@ -178,7 +178,7 @@ main(int argc, char *argv[])
             n = rval;
             bp = buf;
             do {
-                if ((wval = _write(p->fd, bp, n)) == -1) {
+                if ((wval = _write(p->fd, bp, (unsigned int) n)) == -1) {
                     warn("%s: %s", p->name, _strerror(NULL));
                     exitval = 1;
                     break;
@@ -206,4 +206,3 @@ main(int argc, char *argv[])
     _close(STDOUT_FILENO);
     return exitval;
 }
-

--- a/src/tee/makefile
+++ b/src/tee/makefile
@@ -4,8 +4,10 @@
 #
 #
 CC = x86_64-w64-mingw32-gcc
-CC = i686-w64-mingw32-gcc
-CFLAGS=-g -Wall --exec-charset=cp932 --input-charset=utf-8
+#CC = i686-w64-mingw32-gcc
+CFLAGS=-g -Wall -W -Wformat=2 -Wcast-qual -Wcast-align -Wwrite-strings \
+	-Wconversion -Wfloat-equal -Wpointer-arith \
+	--exec-charset=cp932 --input-charset=utf-8
 
 EXE=tee.exe
 OBJS=main.o

--- /dev/null
+++ b/src/wlsfonts/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(wlsfonts C)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wformat=2 -Wcast-qual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wwrite-strings")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wfloat-equal")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --exec-charset=cp932")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --input-charset=utf-8")
+
+add_executable(wlsfonts.exe main.c)
+target_link_libraries(wlsfonts.exe gdi32)

--- a/src/wlsfonts/main.c
+++ b/src/wlsfonts/main.c
@@ -31,6 +31,9 @@ int CALLBACK EnumFontFamProc(
         return 0;
     }
 
+    (void) lpntm;
+    (void)lParam;
+    
     printf("%s, ", lpelf->elfFullName);
     printf("%s, ", lpelf->elfStyle);