Fix MSVC builds - missing profiling.c

OCamlPro · May 13, 2024 · 9cd2dd4 · 9cd2dd4
1 parent 5ba97ae
commit 9cd2dd4
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 14 deletions.
diff --git a/build_windows/ChangeLog.txt b/build_windows/ChangeLog.txt
@@ -1,4 +1,8 @@
 
+2024-05-13  David Declerck <david.declerck@ocamlpro.com>
+
+	* general for libcob: add missing profiling.c
+
 2023-07-07  Simon Sobisch <simonsobisch@gnu.org>
 
 	* general for cobc: include new replace.c

diff --git a/build_windows/ocide/libcob.dll.cpj b/build_windows/ocide/libcob.dll.cpj
@@ -47,6 +47,7 @@
 				<FILE NAME="..\..\libcob\mlio.c" TITLE="mlio.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\move.c" TITLE="move.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\numeric.c" TITLE="numeric.c" CLEAN="0"/>
+				<FILE NAME="..\..\libcob\profiling.c" TITLE="profiling.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\reportio.c" TITLE="reportio.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\screenio.c" TITLE="screenio.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\strings.c" TITLE="strings.c" CLEAN="0"/>

diff --git a/build_windows/vs2005/libcob.vcproj b/build_windows/vs2005/libcob.vcproj
@@ -227,6 +227,10 @@
 				RelativePath="..\..\libcob\numeric.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libcob\profiling.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libcob\reportio.c"
 				>

diff --git a/build_windows/vs2008/libcob.vcproj b/build_windows/vs2008/libcob.vcproj
@@ -223,6 +223,10 @@
 				RelativePath="..\..\libcob\numeric.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libcob\profiling.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libcob\reportio.c"
 				>

diff --git a/build_windows/vs2010/libcob.vcxproj b/build_windows/vs2010/libcob.vcxproj
@@ -174,6 +174,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />
@@ -206,4 +207,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2010/libcob.vcxproj.filters b/build_windows/vs2010/libcob.vcxproj.filters
@@ -54,6 +54,9 @@
     <ClCompile Include="..\..\libcob\mlio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -96,4 +99,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2012/libcob.vcxproj b/build_windows/vs2012/libcob.vcxproj
@@ -176,6 +176,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />
@@ -208,4 +209,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2012/libcob.vcxproj.filters b/build_windows/vs2012/libcob.vcxproj.filters
@@ -54,6 +54,9 @@
     <ClCompile Include="..\..\libcob\mlio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -96,4 +99,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2013/libcob.vcxproj b/build_windows/vs2013/libcob.vcxproj
@@ -177,6 +177,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />
@@ -209,4 +210,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2013/libcob.vcxproj.filters b/build_windows/vs2013/libcob.vcxproj.filters
@@ -54,6 +54,9 @@
     <ClCompile Include="..\..\libcob\mlio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -96,4 +99,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2015/libcob.vcxproj b/build_windows/vs2015/libcob.vcxproj
@@ -168,6 +168,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />
@@ -200,4 +201,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2015/libcob.vcxproj.filters b/build_windows/vs2015/libcob.vcxproj.filters
@@ -54,6 +54,9 @@
     <ClCompile Include="..\..\libcob\mlio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -96,4 +99,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2017/libcob.vcxproj b/build_windows/vs2017/libcob.vcxproj
@@ -173,6 +173,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />
@@ -205,4 +206,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2017/libcob.vcxproj.filters b/build_windows/vs2017/libcob.vcxproj.filters
@@ -54,6 +54,9 @@
     <ClCompile Include="..\..\libcob\mlio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -96,4 +99,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2019/libcob.vcxproj b/build_windows/vs2019/libcob.vcxproj
@@ -173,6 +173,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />
@@ -205,4 +206,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2019/libcob.vcxproj.filters b/build_windows/vs2019/libcob.vcxproj.filters
@@ -54,6 +54,9 @@
     <ClCompile Include="..\..\libcob\mlio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -96,4 +99,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/cobc/flag.def b/cobc/flag.def
@@ -119,11 +119,16 @@ CB_FLAG (cb_flag_winmain, COB_SHOW, "winmain",
 #undef COB_SHOW
 
 #ifdef HAVE_ATTRIBUTE_CONSTRUCTOR
-CB_FLAG_ON (cb_flag_use_constructor, 1, "use-constructor",
+#define CB_FLAG_M CB_FLAG_ON
+#define COB_SHOW 1
 #else
-CB_FLAG (cb_flag_use_constructor, 0, "use-constructor",
+#define CB_FLAG_M CB_FLAG
+#define COB_SHOW 0
 #endif
+CB_FLAG_M (cb_flag_use_constructor, COB_SHOW, "use-constructor",
 	_("  -fuse-constructor     generate internal one-time code via constructor"))
+#undef CB_FLAG_M
+#undef COB_SHOW
 
 CB_FLAG (cb_flag_computed_goto, 0, "computed-goto",
 	_("  -fcomputed-goto       generate computed goto C statements"))