From 9cd2dd4adc2a932ddc2ff733bd63274ac28964b9 Mon Sep 17 00:00:00 2001 From: David Declerck Date: Mon, 13 May 2024 09:58:20 +0200 Subject: [PATCH] Fix MSVC builds - missing profiling.c --- build_windows/ChangeLog.txt | 4 ++++ build_windows/ocide/libcob.dll.cpj | 1 + build_windows/vs2005/libcob.vcproj | 4 ++++ build_windows/vs2008/libcob.vcproj | 4 ++++ build_windows/vs2010/libcob.vcxproj | 3 ++- build_windows/vs2010/libcob.vcxproj.filters | 5 ++++- build_windows/vs2012/libcob.vcxproj | 3 ++- build_windows/vs2012/libcob.vcxproj.filters | 5 ++++- build_windows/vs2013/libcob.vcxproj | 3 ++- build_windows/vs2013/libcob.vcxproj.filters | 5 ++++- build_windows/vs2015/libcob.vcxproj | 3 ++- build_windows/vs2015/libcob.vcxproj.filters | 5 ++++- build_windows/vs2017/libcob.vcxproj | 3 ++- build_windows/vs2017/libcob.vcxproj.filters | 5 ++++- build_windows/vs2019/libcob.vcxproj | 3 ++- build_windows/vs2019/libcob.vcxproj.filters | 5 ++++- cobc/flag.def | 9 +++++++-- 17 files changed, 56 insertions(+), 14 deletions(-) diff --git a/build_windows/ChangeLog.txt b/build_windows/ChangeLog.txt index 8c8aa20ff..d3b0c1be6 100644 --- a/build_windows/ChangeLog.txt +++ b/build_windows/ChangeLog.txt @@ -1,4 +1,8 @@ +2024-05-13 David Declerck + + * general for libcob: add missing profiling.c + 2023-07-07 Simon Sobisch * general for cobc: include new replace.c diff --git a/build_windows/ocide/libcob.dll.cpj b/build_windows/ocide/libcob.dll.cpj index 2cd70ec07..22e6de1ce 100644 --- a/build_windows/ocide/libcob.dll.cpj +++ b/build_windows/ocide/libcob.dll.cpj @@ -47,6 +47,7 @@ + diff --git a/build_windows/vs2005/libcob.vcproj b/build_windows/vs2005/libcob.vcproj index 7bb4cdc0f..66d30bfb5 100644 --- a/build_windows/vs2005/libcob.vcproj +++ b/build_windows/vs2005/libcob.vcproj @@ -227,6 +227,10 @@ RelativePath="..\..\libcob\numeric.c" > + + diff --git a/build_windows/vs2008/libcob.vcproj b/build_windows/vs2008/libcob.vcproj index 0a576bdf1..8ad67ba0f 100644 --- a/build_windows/vs2008/libcob.vcproj +++ b/build_windows/vs2008/libcob.vcproj @@ -223,6 +223,10 @@ RelativePath="..\..\libcob\numeric.c" > + + diff --git a/build_windows/vs2010/libcob.vcxproj b/build_windows/vs2010/libcob.vcxproj index 72c6e3458..4f12d3e9b 100644 --- a/build_windows/vs2010/libcob.vcxproj +++ b/build_windows/vs2010/libcob.vcxproj @@ -174,6 +174,7 @@ + @@ -206,4 +207,4 @@ - \ No newline at end of file + diff --git a/build_windows/vs2010/libcob.vcxproj.filters b/build_windows/vs2010/libcob.vcxproj.filters index 9cec6aff6..db8ac7d1c 100644 --- a/build_windows/vs2010/libcob.vcxproj.filters +++ b/build_windows/vs2010/libcob.vcxproj.filters @@ -54,6 +54,9 @@ Source Files + + Source Files + @@ -96,4 +99,4 @@ Resource Files - \ No newline at end of file + diff --git a/build_windows/vs2012/libcob.vcxproj b/build_windows/vs2012/libcob.vcxproj index 242128413..77717b2c5 100644 --- a/build_windows/vs2012/libcob.vcxproj +++ b/build_windows/vs2012/libcob.vcxproj @@ -176,6 +176,7 @@ + @@ -208,4 +209,4 @@ - \ No newline at end of file + diff --git a/build_windows/vs2012/libcob.vcxproj.filters b/build_windows/vs2012/libcob.vcxproj.filters index 9cec6aff6..db8ac7d1c 100644 --- a/build_windows/vs2012/libcob.vcxproj.filters +++ b/build_windows/vs2012/libcob.vcxproj.filters @@ -54,6 +54,9 @@ Source Files + + Source Files + @@ -96,4 +99,4 @@ Resource Files - \ No newline at end of file + diff --git a/build_windows/vs2013/libcob.vcxproj b/build_windows/vs2013/libcob.vcxproj index 9b4fd514f..bd837d987 100644 --- a/build_windows/vs2013/libcob.vcxproj +++ b/build_windows/vs2013/libcob.vcxproj @@ -177,6 +177,7 @@ + @@ -209,4 +210,4 @@ - \ No newline at end of file + diff --git a/build_windows/vs2013/libcob.vcxproj.filters b/build_windows/vs2013/libcob.vcxproj.filters index 9cec6aff6..db8ac7d1c 100644 --- a/build_windows/vs2013/libcob.vcxproj.filters +++ b/build_windows/vs2013/libcob.vcxproj.filters @@ -54,6 +54,9 @@ Source Files + + Source Files + @@ -96,4 +99,4 @@ Resource Files - \ No newline at end of file + diff --git a/build_windows/vs2015/libcob.vcxproj b/build_windows/vs2015/libcob.vcxproj index 2c2fcf9be..fb29d49b3 100644 --- a/build_windows/vs2015/libcob.vcxproj +++ b/build_windows/vs2015/libcob.vcxproj @@ -168,6 +168,7 @@ + @@ -200,4 +201,4 @@ - \ No newline at end of file + diff --git a/build_windows/vs2015/libcob.vcxproj.filters b/build_windows/vs2015/libcob.vcxproj.filters index 17fce0745..b13c7c07b 100644 --- a/build_windows/vs2015/libcob.vcxproj.filters +++ b/build_windows/vs2015/libcob.vcxproj.filters @@ -54,6 +54,9 @@ Source Files + + Source Files + @@ -96,4 +99,4 @@ Resource Files - \ No newline at end of file + diff --git a/build_windows/vs2017/libcob.vcxproj b/build_windows/vs2017/libcob.vcxproj index 3e90d7b26..72cca60ca 100644 --- a/build_windows/vs2017/libcob.vcxproj +++ b/build_windows/vs2017/libcob.vcxproj @@ -173,6 +173,7 @@ + @@ -205,4 +206,4 @@ - \ No newline at end of file + diff --git a/build_windows/vs2017/libcob.vcxproj.filters b/build_windows/vs2017/libcob.vcxproj.filters index 17fce0745..b13c7c07b 100644 --- a/build_windows/vs2017/libcob.vcxproj.filters +++ b/build_windows/vs2017/libcob.vcxproj.filters @@ -54,6 +54,9 @@ Source Files + + Source Files + @@ -96,4 +99,4 @@ Resource Files - \ No newline at end of file + diff --git a/build_windows/vs2019/libcob.vcxproj b/build_windows/vs2019/libcob.vcxproj index 316a56df8..fe0bc688d 100644 --- a/build_windows/vs2019/libcob.vcxproj +++ b/build_windows/vs2019/libcob.vcxproj @@ -173,6 +173,7 @@ + @@ -205,4 +206,4 @@ - \ No newline at end of file + diff --git a/build_windows/vs2019/libcob.vcxproj.filters b/build_windows/vs2019/libcob.vcxproj.filters index 17fce0745..b13c7c07b 100644 --- a/build_windows/vs2019/libcob.vcxproj.filters +++ b/build_windows/vs2019/libcob.vcxproj.filters @@ -54,6 +54,9 @@ Source Files + + Source Files + @@ -96,4 +99,4 @@ Resource Files - \ No newline at end of file + diff --git a/cobc/flag.def b/cobc/flag.def index 7d40570e7..ad6f720c5 100644 --- 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"))