Successfully compiled on Win11

src/CMakeLists.txt

@@ -1,6 +1,12 @@
 # 设定源文件文件夹
 aux_source_directory(lib LIBTIN_SRC)
 
+if(WIN32)
+	find_package(GetOptWin REQUIRED)
+	message(STATUS "Found GetOpt-Win")
+	include_directories(${GetOptWin_INC_DIR})
+endif()
+
 # 以下部分为库的编译
 # 注意目标名必须唯一 所以不能直接生成相同名称的动态库与静态库
 # 注意此处不必为目标名称添加lib前缀和相应后缀，cmake会自行添加
@@ -41,12 +47,10 @@ else()
 		EXPORT ${PROJECT_NAME}Targets
 		LIBRARY DESTINATION lib
 		ARCHIVE DESTINATION lib)
-	install(EXPORT ${PROJECT_NAME}Targets
-	        DESTINATION ${CONFIG_FILE_PATH})
 	install(FILES
-        ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+	        ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-        ${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+	        ${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-        DESTINATION ${CONFIG_FILE_PATH})
+	        DESTINATION ${CONFIG_FILE_PATH})
 endif()
 # 头文件安装命令
 install(FILES lib/tin.h DESTINATION include)
@@ -78,9 +82,13 @@ macro(add_tool name)
 	set_target_properties(${name} PROPERTIES INSTALL_RPATH /usr/local/lib)
 	# 链接动态库
 	target_link_libraries(${name} PUBLIC tin)
-	# 安装可执行程序
-	install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/sbin)
 endmacro()
 
 add_tool(grd2tin)
-add_tool(rnd2tin)
+add_tool(rnd2tin)
+# Windows下需要单独链接getopt库
+if(WIN32)
+	link_directories(${GetOptWin_LIB_DIR})
+	target_link_libraries(grd2tin PUBLIC ${GetOptWin_LIB})
+	target_link_libraries(rnd2tin PUBLIC ${GetOptWin_LIB})
+endif()

src/tool/display_help.h

@@ -6,11 +6,16 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <iomanip>
-#include <sys/ioctl.h>
 #include "vector"
 
+#if defined _WINDOWS || __WIN32__
+#include "windows.h"
+#else
+#include "sys/ioctl.h"
+#include "unistd.h"
+#endif
+
 using namespace std;
 
 typedef vector<string> strArray;
@@ -101,9 +106,19 @@ void dispHelp::show()
 	int line_length;
 	string segment,full_message;
 	stringstream ss_message;
+
+	int width;
 	//获取终端窗口的行列数
+#if defined _WINDOWS || __WIN32__
+	CONSOLE_SCREEN_BUFFER_INFO csbi;
+	GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
+	width = csbi.srWindow.Right - csbi.srWindow.Left;
+#else
 	struct winsize w;
 	ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
+	width = w.ws_col;
+#endif
+
 	//显示头信息
 	full_message = ex_name + " " + version + " - " + descript;
 	ss_message.clear(); ss_message.str(full_message);
@@ -111,7 +126,7 @@ void dispHelp::show()
 	line_length = front_space + back_space;
 	while(ss_message >> segment)
 	{
-		if ((line_length+segment.length()+1) <= w.ws_col)
+		if ((line_length+segment.length()+1) <= width)
 		{
 			if (line_length == (front_space + back_space))
 			{
@@ -139,7 +154,7 @@ void dispHelp::show()
 	line_length = front_space + back_space;;
 	while(ss_message >> segment)
 	{
-		if ((line_length+segment.length()+1) <= w.ws_col)
+		if ((line_length+segment.length()+1) <= width)
 		{
 			if (line_length == (front_space + back_space))
 			{
@@ -174,7 +189,7 @@ void dispHelp::show()
 			line_length = front_space + back_space + 4;
 			while(ss_message >> segment)
 			{
-				if ((line_length+segment.length()+1) <= w.ws_col)
+				if ((line_length+segment.length()+1) <= width)
 				{
 					if (line_length == (front_space+back_space+4))
 					{
@@ -214,7 +229,7 @@ void dispHelp::show()
 				line_length = front_space + back_space + 4;
 				while(ss_message >> segment)
 				{
-					if ((line_length+segment.length()+1) <= w.ws_col)
+					if ((line_length+segment.length()+1) <= width)
 					{
 						if (line_length == (front_space+back_space+4))
 						{
@@ -247,7 +262,7 @@ void dispHelp::show()
 						line_length = front_space + back_space + 9;
 						while(ss_message >> segment)
 						{
-							if ((line_length+segment.length()+1) <= w.ws_col)
+							if ((line_length+segment.length()+1) <= width)
 							{
 								if (line_length == (front_space+back_space+9))
 								{
@@ -281,7 +296,7 @@ void dispHelp::show()
 				line_length = front_space + back_space + 4;
 				while(ss_message >> segment)
 				{
-					if ((line_length+segment.length()+1) <= w.ws_col)
+					if ((line_length+segment.length()+1) <= width)
 					{
 						if (line_length == (front_space+back_space+4))
 						{
@@ -314,7 +329,7 @@ void dispHelp::show()
 						line_length = front_space + back_space + 9;
 						while(ss_message >> segment)
 						{
-							if ((line_length+segment.length()+1) <= w.ws_col)
+							if ((line_length+segment.length()+1) <= width)
 							{
 								if (line_length == (front_space+back_space+9))
 								{
@@ -354,7 +369,7 @@ void dispHelp::show()
 			line_length = front_space + back_space + 4;
 			while(ss_message >> segment)
 			{
-				if ((line_length+segment.length()+1) <= w.ws_col)
+				if ((line_length+segment.length()+1) <= width)
 				{
 					if (line_length == (front_space+back_space+4))
 					{

src/tool/getopt_win.h

@@ -1,230 +0,0 @@
-/******************************************************//**
- *  ██████╗  ██████╗████████╗██╗
- * ██╔════╝ ██╔════╝╚══██╔══╝██║
- * ██║  ███╗██║        ██║   ██║
- * ██║   ██║██║        ██║   ██║
- * ╚██████╔╝╚██████╗   ██║   ███████╗
- *  ╚═════╝  ╚═════╝   ╚═╝   ╚══════╝
- * Geophysical Computational Tools & Library
- *
- * Copyright (c) 2019-2029 The GCTL developing team.
- * Correspondents: Dr. Yi Zhang (zhangyiss@icloud.com)
- * All rights reserved.
- *
- * This file is part of the GCTL software. Permission is hereby granted to any 
- * person obtaining a copy of this software and associated documentation files 
- * (the "Software"), to deal in the Software and to permit persons to whom the 
- * Software is furnished to do so, subject to the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 2. The GCTL is only free of charge for academic and non-profit purpose. For 
- * commercial purpose, A commercial license must be obtained by contacting the 
- * developing team.
- * 3. Publications which have used the GCTL must include a reference to the GCTL 
- * package.
- * 4. Bugs and fixings shall be sent to the developing team for review.
- * 5. Updated affiliations shall be sent to the developing team for review.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *********************************************************/
-
-/* Declarations for getopt.
-   Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009,2010
-   Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _GETOPT_H
-
-#ifndef __need_getopt
-# define _GETOPT_H 1
-#endif
-
-/* If __GNU_LIBRARY__ is not already defined, either we are being used
-   standalone, or this is the first header included in the source file.
-   If we are being used with glibc, we need to include <features.h>, but
-   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
-   not defined, include <ctype.h>, which will pull in <features.h> for us
-   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
-   doesn't flood the namespace with stuff the way some other headers do.)  */
-#if !defined __GNU_LIBRARY__
-# include <ctype.h>
-#endif
-
-#ifndef __THROW
-# ifndef __GNUC_PREREQ
-#  define __GNUC_PREREQ(maj, min) (0)
-# endif
-# if defined __cplusplus && __GNUC_PREREQ (2,8)
-#  define __THROW	throw ()
-# else
-#  define __THROW
-# endif
-#endif
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int optopt;
-
-#ifndef __need_getopt
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument		(or 0) if the option does not take an argument,
-   required_argument	(or 1) if the option requires an argument,
-   optional_argument 	(or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct option
-{
-  const char *name;
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-# define no_argument		0
-# define required_argument	1
-# define optional_argument	2
-#endif	/* need getopt */
-
-
-/* Get definitions and prototypes for functions to process the
-   arguments in ARGV (ARGC of them, minus the program name) for
-   options given in OPTS.
-
-   Return the option character from OPTS just read.  Return -1 when
-   there are no more options.  For unrecognized options, or options
-   missing arguments, `optopt' is set to the option letter, and '?' is
-   returned.
-
-   The OPTS string is a list of characters which are recognized option
-   letters, optionally followed by colons, specifying that that letter
-   takes an argument, to be placed in `optarg'.
-
-   If a letter in OPTS is followed by two colons, its argument is
-   optional.  This behavior is specific to the GNU `getopt'.
-
-   The argument `--' causes premature termination of argument
-   scanning, explicitly telling `getopt' that there are no more
-   options.
-
-   If OPTS begins with `--', then non-option arguments are treated as
-   arguments to the option '\0'.  This behavior is specific to the GNU
-   `getopt'.  */
-
-#ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
-       __THROW;
-
-# if defined __need_getopt && defined __USE_POSIX2 \
-  && !defined __USE_POSIX_IMPLICITLY && !defined __USE_GNU
-/* The GNU getopt has more functionality than the standard version.  The
-   additional functionality can be disable at runtime.  This redirection
-   helps to also do this at runtime.  */
-#  ifdef __REDIRECT
-  extern int __REDIRECT_NTH (getopt, (int ___argc, char *const *___argv,
-				      const char *__shortopts),
-			     __posix_getopt);
-#  else
-extern int __posix_getopt (int ___argc, char *const *___argv,
-			   const char *__shortopts) __THROW;
-#   define getopt __posix_getopt
-#  endif
-# endif
-#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-#endif /* __GNU_LIBRARY__ */
-
-#ifndef __need_getopt
-extern int getopt_long (int ___argc, char *const *___argv,
-			const char *__shortopts,
-		        const struct option *__longopts, int *__longind)
-       __THROW;
-extern int getopt_long_only (int ___argc, char *const *___argv,
-			     const char *__shortopts,
-		             const struct option *__longopts, int *__longind)
-       __THROW;
-
-#endif
-
-#ifdef	__cplusplus
-}
-#endif
-
-/* Make sure we later can get all the definitions and declarations.  */
-#undef __need_getopt
-
-#endif /* getopt.h */

src/tool/grd2tin.cpp

@@ -5,12 +5,7 @@
 #include "fstream"
 #include "sstream"
 #include "string"
-
-#ifdef _WINDOWS
-#include "getopt_win.h"
-#else
 #include "getopt.h"
-#endif
 
 void display_help(std::string exe_name)
 {

src/tool/rnd2tin.cpp

@@ -5,12 +5,7 @@
 #include "fstream"
 #include "sstream"
 #include "string"
-
-#ifdef _WINDOWS
-#include "getopt_win.h"
-#else
 #include "getopt.h"
-#endif
 
 void display_help(std::string exe_name)
 {