Mercurial > hg > uwproj / changeset

changeset

rename debug/release flags, fixes #570

Sun, 12 Jan 2025 11:26:16 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 12 Jan 2025 11:26:16 +0100
changeset 131
7241d072ace4
parent 130
424a0fb2c64f
child 132
e0478362c2cf

rename debug/release flags, fixes #570

src/main/resources/make/cc.mk file | annotate | diff | comparison | revisions
src/main/resources/make/clang.mk file | annotate | diff | comparison | revisions
src/main/resources/make/configure.vm file | annotate | diff | comparison | revisions
src/main/resources/make/gcc.mk file | annotate | diff | comparison | revisions
src/main/resources/make/suncc.mk file | annotate | diff | comparison | revisions
test/configure file | annotate | diff | comparison | revisions
test/configure2 file | annotate | diff | comparison | revisions
test/make/cc.mk file | annotate | diff | comparison | revisions
test/make/clang.mk file | annotate | diff | comparison | revisions
test/make/configure.vm file | annotate | diff | comparison | revisions
test/make/gcc.mk file | annotate | diff | comparison | revisions
test/make/suncc.mk file | annotate | diff | comparison | revisions 
--- a/src/main/resources/make/cc.mk	Sun Dec 15 15:00:13 2024 +0100
+++ b/src/main/resources/make/cc.mk	Sun Jan 12 11:26:16 2025 +0100
@@ -4,11 +4,11 @@
 
 CFLAGS =
 CXXFLAGS =
-DEBUG_CC_FLAGS = -g
-DEBUG_CXX_FLAGS = -g
-RELEASE_CC_FLAGS = -O3 -DNDEBUG
-RELEASE_CXX_FLAGS = -O3 -DNDEBUG
+DEBUG_CFLAGS = -g
+DEBUG_CXXFLAGS = -g
+RELEASE_CFLAGS = -O3 -DNDEBUG
+RELEASE_CXXFLAGS = -O3 -DNDEBUG
 LDFLAGS =
 
 SHLIB_CFLAGS = -fPIC
-SHLIB_LDFLAGS = -shared
\ No newline at end of file
+SHLIB_LDFLAGS = -shared
--- a/src/main/resources/make/clang.mk	Sun Dec 15 15:00:13 2024 +0100
+++ b/src/main/resources/make/clang.mk	Sun Jan 12 11:26:16 2025 +0100
@@ -4,10 +4,10 @@
 
 CFLAGS =
 CXXFLAGS =
-DEBUG_CC_FLAGS = -g
-DEBUG_CXX_FLAGS = -g
-RELEASE_CC_FLAGS = -O3 -DNDEBUG
-RELEASE_CXX_FLAGS = -O3 -DNDEBUG
+DEBUG_CFLAGS = -g
+DEBUG_CXXFLAGS = -g
+RELEASE_CFLAGS = -O3 -DNDEBUG
+RELEASE_CXXFLAGS = -O3 -DNDEBUG
 LDFLAGS =
 
 SHLIB_CFLAGS = -fPIC
--- a/src/main/resources/make/configure.vm	Sun Dec 15 15:00:13 2024 +0100
+++ b/src/main/resources/make/configure.vm	Sun Jan 12 11:26:16 2025 +0100
@@ -663,18 +663,18 @@
 fi
 if [ "$BUILD_TYPE" = "debug" ]; then
     if [ -n "$lang_c" ]; then
-        echo '${target.cFlags} += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo '${target.cFlags} += ${DEBUG_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo '${target.cxxFlags} += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo '${target.cxxFlags} += ${DEBUG_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ "$BUILD_TYPE" = "release" ]; then
     if [ -n "$lang_c" ]; then
-        echo '${target.cFlags} += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo '${target.cFlags} += ${RELEASE_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo '${target.cxxFlags} += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo '${target.cxxFlags} += ${RELEASE_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ -n "${TEMP_LDFLAGS}" ]; then
--- a/src/main/resources/make/gcc.mk	Sun Dec 15 15:00:13 2024 +0100
+++ b/src/main/resources/make/gcc.mk	Sun Jan 12 11:26:16 2025 +0100
@@ -4,10 +4,10 @@
 
 CFLAGS =
 CXXFLAGS =
-DEBUG_CC_FLAGS = -g
-DEBUG_CXX_FLAGS = -g
-RELEASE_CC_FLAGS = -O3 -DNDEBUG
-RELEASE_CXX_FLAGS = -O3 -DNDEBUG
+DEBUG_CFLAGS = -g
+DEBUG_CXXFLAGS = -g
+RELEASE_CFLAGS = -O3 -DNDEBUG
+RELEASE_CXXFLAGS = -O3 -DNDEBUG
 LDFLAGS =
 
 SHLIB_CFLAGS = -fPIC
--- a/src/main/resources/make/suncc.mk	Sun Dec 15 15:00:13 2024 +0100
+++ b/src/main/resources/make/suncc.mk	Sun Jan 12 11:26:16 2025 +0100
@@ -4,10 +4,10 @@
 
 CFLAGS =
 CXXFLAGS =
-DEBUG_CC_FLAGS = -g
-DEBUG_CXX_FLAGS = -g
-RELEASE_CC_FLAGS = -O3 -DNDEBUG
-RELEASE_CXX_FLAGS = -O3 -DNDEBUG
+DEBUG_CFLAGS = -g
+DEBUG_CXXFLAGS = -g
+RELEASE_CFLAGS = -O3 -DNDEBUG
+RELEASE_CXXFLAGS = -O3 -DNDEBUG
 LDFLAGS =
 
 SHLIB_CFLAGS = -Kpic
--- a/test/configure	Sun Dec 15 15:00:13 2024 +0100
+++ b/test/configure	Sun Jan 12 11:26:16 2025 +0100
@@ -601,18 +601,18 @@
 fi
 if [ "$BUILD_TYPE" = "debug" ]; then
     if [ -n "$lang_c" ]; then
-        echo 'CFLAGS += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CFLAGS += ${DEBUG_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo 'CXXFLAGS += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CXXFLAGS += ${DEBUG_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ "$BUILD_TYPE" = "release" ]; then
     if [ -n "$lang_c" ]; then
-        echo 'CFLAGS += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CFLAGS += ${RELEASE_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo 'CXXFLAGS += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CXXFLAGS += ${RELEASE_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ -n "${TEMP_LDFLAGS}" ]; then
--- a/test/configure2	Sun Dec 15 15:00:13 2024 +0100
+++ b/test/configure2	Sun Jan 12 11:26:16 2025 +0100
@@ -770,18 +770,18 @@
 fi
 if [ "$BUILD_TYPE" = "debug" ]; then
     if [ -n "$lang_c" ]; then
-        echo 'DAV_CFLAGS += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'DAV_CFLAGS += ${DEBUG_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo 'DAV_CXXFLAGS += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'DAV_CXXFLAGS += ${DEBUG_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ "$BUILD_TYPE" = "release" ]; then
     if [ -n "$lang_c" ]; then
-        echo 'DAV_CFLAGS += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'DAV_CFLAGS += ${RELEASE_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo 'DAV_CXXFLAGS += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'DAV_CXXFLAGS += ${RELEASE_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ -n "${TEMP_LDFLAGS}" ]; then
@@ -811,18 +811,18 @@
 fi
 if [ "$BUILD_TYPE" = "debug" ]; then
     if [ -n "$lang_c" ]; then
-        echo 'CFLAGS += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CFLAGS += ${DEBUG_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo 'CXXFLAGS += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CXXFLAGS += ${DEBUG_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ "$BUILD_TYPE" = "release" ]; then
     if [ -n "$lang_c" ]; then
-        echo 'CFLAGS += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CFLAGS += ${RELEASE_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo 'CXXFLAGS += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo 'CXXFLAGS += ${RELEASE_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ -n "${TEMP_LDFLAGS}" ]; then
--- a/test/make/cc.mk	Sun Dec 15 15:00:13 2024 +0100
+++ b/test/make/cc.mk	Sun Jan 12 11:26:16 2025 +0100
@@ -4,11 +4,11 @@
 
 CFLAGS =
 CXXFLAGS =
-DEBUG_CC_FLAGS = -g
-DEBUG_CXX_FLAGS = -g
-RELEASE_CC_FLAGS = -O3 -DNDEBUG
-RELEASE_CXX_FLAGS = -O3 -DNDEBUG
+DEBUG_CFLAGS = -g
+DEBUG_CXXFLAGS = -g
+RELEASE_CFLAGS = -O3 -DNDEBUG
+RELEASE_CXXFLAGS = -O3 -DNDEBUG
 LDFLAGS =
 
 SHLIB_CFLAGS = -fPIC
-SHLIB_LDFLAGS = -shared
\ No newline at end of file
+SHLIB_LDFLAGS = -shared
--- a/test/make/clang.mk	Sun Dec 15 15:00:13 2024 +0100
+++ b/test/make/clang.mk	Sun Jan 12 11:26:16 2025 +0100
@@ -4,10 +4,10 @@
 
 CFLAGS =
 CXXFLAGS =
-DEBUG_CC_FLAGS = -g
-DEBUG_CXX_FLAGS = -g
-RELEASE_CC_FLAGS = -O3 -DNDEBUG
-RELEASE_CXX_FLAGS = -O3 -DNDEBUG
+DEBUG_CFLAGS = -g
+DEBUG_CXXFLAGS = -g
+RELEASE_CFLAGS = -O3 -DNDEBUG
+RELEASE_CXXFLAGS = -O3 -DNDEBUG
 LDFLAGS =
 
 SHLIB_CFLAGS = -fPIC
--- a/test/make/configure.vm	Sun Dec 15 15:00:13 2024 +0100
+++ b/test/make/configure.vm	Sun Jan 12 11:26:16 2025 +0100
@@ -663,18 +663,18 @@
 fi
 if [ "$BUILD_TYPE" = "debug" ]; then
     if [ -n "$lang_c" ]; then
-        echo '${target.cFlags} += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo '${target.cFlags} += ${DEBUG_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo '${target.cxxFlags} += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo '${target.cxxFlags} += ${DEBUG_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ "$BUILD_TYPE" = "release" ]; then
     if [ -n "$lang_c" ]; then
-        echo '${target.cFlags} += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo '${target.cFlags} += ${RELEASE_CFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
     if [ -n "$lang_cpp" ]; then
-        echo '${target.cxxFlags} += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+        echo '${target.cxxFlags} += ${RELEASE_CXXFLAGS}' >> "$TEMP_DIR/flags.mk"
     fi
 fi
 if [ -n "${TEMP_LDFLAGS}" ]; then
--- a/test/make/gcc.mk	Sun Dec 15 15:00:13 2024 +0100
+++ b/test/make/gcc.mk	Sun Jan 12 11:26:16 2025 +0100
@@ -4,10 +4,10 @@
 
 CFLAGS =
 CXXFLAGS =
-DEBUG_CC_FLAGS = -g
-DEBUG_CXX_FLAGS = -g
-RELEASE_CC_FLAGS = -O3 -DNDEBUG
-RELEASE_CXX_FLAGS = -O3 -DNDEBUG
+DEBUG_CFLAGS = -g
+DEBUG_CXXFLAGS = -g
+RELEASE_CFLAGS = -O3 -DNDEBUG
+RELEASE_CXXFLAGS = -O3 -DNDEBUG
 LDFLAGS =
 
 SHLIB_CFLAGS = -fPIC
--- a/test/make/suncc.mk	Sun Dec 15 15:00:13 2024 +0100
+++ b/test/make/suncc.mk	Sun Jan 12 11:26:16 2025 +0100
@@ -4,10 +4,10 @@
 
 CFLAGS =
 CXXFLAGS =
-DEBUG_CC_FLAGS = -g
-DEBUG_CXX_FLAGS = -g
-RELEASE_CC_FLAGS = -O3 -DNDEBUG
-RELEASE_CXX_FLAGS = -O3 -DNDEBUG
+DEBUG_CFLAGS = -g
+DEBUG_CXXFLAGS = -g
+RELEASE_CFLAGS = -O3 -DNDEBUG
+RELEASE_CXXFLAGS = -O3 -DNDEBUG
 LDFLAGS =
 
 SHLIB_CFLAGS = -Kpic

Mercurial Repository: uwproj

mercurial