浏览代码

解决bps/simulator无法在vs2019环境下编译

Signed-off-by: latercomer <latercomer@qq.com>
latercomer 1 月之前
父节点
当前提交
76c2f2d77f
共有 4 个文件被更改,包括 11 次插入0 次删除
  1. 1 0
      .gitignore
  2. 1 0
      bsp/simulator/template_vs2012.vcxproj
  3. 8 0
      components/finsh/finsh.h
  4. 1 0
      src/scheduler_up.c

+ 1 - 0
.gitignore

@@ -13,6 +13,7 @@
 *.crf
 build
 Debug
+.vs
 rtthread
 settings
 documentation/html

+ 1 - 0
bsp/simulator/template_vs2012.vcxproj

@@ -44,6 +44,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
     <Link>
       <AdditionalDependencies>winmm.lib;Packet.lib;wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>

+ 8 - 0
components/finsh/finsh.h

@@ -212,14 +212,22 @@ typedef struct msh_cmd_opt
  *
  * @param[in] command The command associated with these options.
  */
+#ifdef _MSC_VER
+#define CMD_OPTIONS_STATEMENT(command) static struct msh_cmd_opt command##_msh_options[16];
+#else
 #define CMD_OPTIONS_STATEMENT(command) static struct msh_cmd_opt command##_msh_options[];
+#endif
 
 /**
  * @brief Starts the definition of command options for a specific command.
  *
  * @param[in] command The command these options are associated with.
  */
+#ifdef _MSC_VER
+#define CMD_OPTIONS_NODE_START(command) static struct msh_cmd_opt command##_msh_options[16] = {
+#else
 #define CMD_OPTIONS_NODE_START(command) static struct msh_cmd_opt command##_msh_options[] = {
+#endif
 
 /**
  * @brief Defines a single command option.

+ 1 - 0
src/scheduler_up.c

@@ -32,6 +32,7 @@
  * 2023-10-17     ChuShicheng  Modify the timing of clearing RT_THREAD_STAT_YIELD flag bits
  */
 
+#define __RT_IPC_SOURCE__
 #include <rtthread.h>
 #include <rthw.h>