From 1e7b838d7bdeb5091f7ee161b25d24a75501ac28 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Tue, 4 Nov 2025 02:34:16 +0000 Subject: [PATCH] move files git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@589 b9cfdab3-6d41-4d17-bbe4-086880011989 --- include/Mw/Milsko.h | 5 +-- include/Mw/{ => Resource}/Cursor.h | 6 ++-- include/Mw/{ => Resource}/Icon.h | 6 ++-- src/icon/search.c | 2 +- tools/icon.sh | 50 +++++++++++++++--------------- 5 files changed, 35 insertions(+), 34 deletions(-) rename include/Mw/{ => Resource}/Cursor.h (88%) rename include/Mw/{ => Resource}/Icon.h (92%) diff --git a/include/Mw/Milsko.h b/include/Mw/Milsko.h index e9e49eb..709e358 100644 --- a/include/Mw/Milsko.h +++ b/include/Mw/Milsko.h @@ -15,14 +15,15 @@ #include #include #include -#include #include #include -#include #include #include #include +#include +#include + #include #include #include diff --git a/include/Mw/Cursor.h b/include/Mw/Resource/Cursor.h similarity index 88% rename from include/Mw/Cursor.h rename to include/Mw/Resource/Cursor.h index aeaa19c..f615ae2 100644 --- a/include/Mw/Cursor.h +++ b/include/Mw/Resource/Cursor.h @@ -1,11 +1,11 @@ /* $Id$ */ /*! - * @file Mw/Cursor.h + * @file Mw/Resource/Cursor.h * @brief Cursor externs */ -#ifndef __MW_CURSOR_H__ -#define __MW_CURSOR_H__ +#ifndef __MW_RESOURCE_CURSOR_H__ +#define __MW_RESOURCE_CURSOR_H__ #include #include diff --git a/include/Mw/Icon.h b/include/Mw/Resource/Icon.h similarity index 92% rename from include/Mw/Icon.h rename to include/Mw/Resource/Icon.h index 43ac7c7..bb6f2a7 100644 --- a/include/Mw/Icon.h +++ b/include/Mw/Resource/Icon.h @@ -1,10 +1,10 @@ /* $Id$ */ /*! - * @file Mw/Icon.h + * @file Mw/Resource/Icon.h * @brief Icon */ -#ifndef __MW_ICON_H__ -#define __MW_ICON_H__ +#ifndef __MW_RESOURCE_ICON_H__ +#define __MW_RESOURCE_ICON_H__ #include diff --git a/src/icon/search.c b/src/icon/search.c index 7e99d51..5ab6649 100644 --- a/src/icon/search.c +++ b/src/icon/search.c @@ -1,4 +1,4 @@ -/* $Id: icon.sh 538 2025-10-31 21:18:11Z nishi $ */ +/* $Id: icon.sh 588 2025-11-04 02:18:33Z nishi $ */ #include unsigned int MwIconSearch[] = { diff --git a/tools/icon.sh b/tools/icon.sh index 194ea0d..d3ecb67 100755 --- a/tools/icon.sh +++ b/tools/icon.sh @@ -1,20 +1,20 @@ #!/bin/sh # $Id$ -echo '/* $Id$ */' > include/Mw/Icon.h -echo '/*!' >> include/Mw/Icon.h -echo ' * @file Mw/Icon.h' >> include/Mw/Icon.h -echo ' * @brief Icon' >> include/Mw/Icon.h -echo ' */' >> include/Mw/Icon.h -echo '#ifndef __MW_ICON_H__' >> include/Mw/Icon.h -echo '#define __MW_ICON_H__' >> include/Mw/Icon.h -echo '' >> include/Mw/Icon.h -echo '#include ' >> include/Mw/Icon.h -echo '' >> include/Mw/Icon.h -echo '#ifdef __cplusplus' >> include/Mw/Icon.h -echo 'extern "C" {' >> include/Mw/Icon.h -echo '#endif' >> include/Mw/Icon.h -echo '' >> include/Mw/Icon.h +echo '/* $Id$ */' > include/Mw/Resource/Icon.h +echo '/*!' >> include/Mw/Resource/Icon.h +echo ' * @file Mw/Resource/Icon.h' >> include/Mw/Resource/Icon.h +echo ' * @brief Icon' >> include/Mw/Resource/Icon.h +echo ' */' >> include/Mw/Resource/Icon.h +echo '#ifndef __MW_RESOURCE_ICON_H__' >> include/Mw/Resource/Icon.h +echo '#define __MW_RESOURCE_ICON_H__' >> include/Mw/Resource/Icon.h +echo '' >> include/Mw/Resource/Icon.h +echo '#include ' >> include/Mw/Resource/Icon.h +echo '' >> include/Mw/Resource/Icon.h +echo '#ifdef __cplusplus' >> include/Mw/Resource/Icon.h +echo 'extern "C" {' >> include/Mw/Resource/Icon.h +echo '#endif' >> include/Mw/Resource/Icon.h +echo '' >> include/Mw/Resource/Icon.h for i in resource/icon/*.png; do LOWER=`echo $i | rev | cut -d"/" -f1 | rev | cut -d"." -f1` if [ "$LOWER" = "unsure" ]; then @@ -37,15 +37,15 @@ for i in resource/icon/*.png; do echo $NAME done | while read a; do echo $a - echo '/*!' >> include/Mw/Icon.h - echo " * @brief `echo $a | sed s/MwIcon//` icon" >> include/Mw/Icon.h - echo ' */' >> include/Mw/Icon.h - echo "MWDECL unsigned int $a[];" >> include/Mw/Icon.h - echo '' >> include/Mw/Icon.h + echo '/*!' >> include/Mw/Resource/Icon.h + echo " * @brief `echo $a | sed s/MwIcon//` icon" >> include/Mw/Resource/Icon.h + echo ' */' >> include/Mw/Resource/Icon.h + echo "MWDECL unsigned int $a[];" >> include/Mw/Resource/Icon.h + echo '' >> include/Mw/Resource/Icon.h done -echo '' >> include/Mw/Icon.h -echo '#ifdef __cplusplus' >> include/Mw/Icon.h -echo '}' >> include/Mw/Icon.h -echo '#endif' >> include/Mw/Icon.h -echo '' >> include/Mw/Icon.h -echo '#endif' >> include/Mw/Icon.h +echo '' >> include/Mw/Resource/Icon.h +echo '#ifdef __cplusplus' >> include/Mw/Resource/Icon.h +echo '}' >> include/Mw/Resource/Icon.h +echo '#endif' >> include/Mw/Resource/Icon.h +echo '' >> include/Mw/Resource/Icon.h +echo '#endif' >> include/Mw/Resource/Icon.h