Mercurial > hg > uwproj / changeset

--- a/src/main/resources/make/configure.vm	Sat Nov 02 14:23:45 2024 +0100
+++ b/src/main/resources/make/configure.vm	Tue Nov 12 16:53:27 2024 +0100
@@ -568,6 +568,18 @@
         unset ${feature.varName}
     fi
 fi
+if [ -n "${D}${feature.varName}" ]; then
+    :
+#foreach( $def in $feature.defines )
+    TEMP_CFLAGS="$TEMP_CFLAGS ${def.toFlags()}"
+    TEMP_CXXFLAGS="$TEMP_CXXFLAGS ${def.toFlags()}"
+#end
+#if( $feature.hasMake() )
+    cat >> "$TEMP_DIR/make.mk" << __EOF__
+$feature.make
+__EOF__
+#end
+fi
 #end
 
 #foreach( $opt in $target.options )

--- a/test/configure	Sat Nov 02 14:23:45 2024 +0100
+++ b/test/configure	Tue Nov 12 16:53:27 2024 +0100
@@ -582,6 +582,9 @@
         unset FEATURE_PG
     fi
 fi
+if [ -n "$FEATURE_PG" ]; then
+    :
+fi
 
 
 if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then

--- a/test/configure2	Sat Nov 02 14:23:45 2024 +0100
+++ b/test/configure2	Tue Nov 12 16:53:27 2024 +0100
@@ -650,6 +650,11 @@
         unset FEATURE_DB
     fi
 fi
+if [ -n "$FEATURE_DB" ]; then
+    :
+    TEMP_CFLAGS="$TEMP_CFLAGS -DDATABASE"
+    TEMP_CXXFLAGS="$TEMP_CXXFLAGS -DDATABASE"
+fi
 if [ -n "$FEATURE_GUI" ]; then
     # check dependency
     if dependency_error_gtk3 ; then
@@ -665,6 +670,11 @@
         unset FEATURE_GUI
     fi
 fi
+if [ -n "$FEATURE_GUI" ]; then
+    :
+    TEMP_CFLAGS="$TEMP_CFLAGS -DUI=GTK3"
+    TEMP_CXXFLAGS="$TEMP_CXXFLAGS -DUI=GTK3"
+fi
 
 # Option: --toolkit
 if [ -z "$OPT_TOOLKIT" ]; then

--- a/test/make/configure.vm	Sat Nov 02 14:23:45 2024 +0100
+++ b/test/make/configure.vm	Tue Nov 12 16:53:27 2024 +0100
@@ -568,6 +568,18 @@
         unset ${feature.varName}
     fi
 fi
+if [ -n "${D}${feature.varName}" ]; then
+    :
+#foreach( $def in $feature.defines )
+    TEMP_CFLAGS="$TEMP_CFLAGS ${def.toFlags()}"
+    TEMP_CXXFLAGS="$TEMP_CXXFLAGS ${def.toFlags()}"
+#end
+#if( $feature.hasMake() )
+    cat >> "$TEMP_DIR/make.mk" << __EOF__
+$feature.make
+__EOF__
+#end
+fi
 #end
 
 #foreach( $opt in $target.options )