fix build

diff --git a/application/Makefile b/application/Makefile
index a1bf5eaec9ec1c206caa4e055f280a7697bff73e..b8b7805b530576ddd1b48cce074d77cb04042e75 100644 (file)
--- a/application/Makefile
+++ b/application/Makefile
@@ -51,7 +51,7 @@ BINTARGET = uwplayer
 all: $(BUILD_ROOT)/build/bin/$(BINTARGET)
 
 $(BUILD_ROOT)/build/bin/$(BINTARGET): $(OBJ)
-       $(LD) -o $(BUILD_ROOT)/build/bin/$(BINTARGET) $(OBJ) -L$(BUILD_ROOT)/build/lib -lucx $(LDFLAGS) $(APP_LDFLAGS)
+       $(CC) -o $(BUILD_ROOT)/build/bin/$(BINTARGET) $(OBJ) -L$(BUILD_ROOT)/build/lib -lucx $(LDFLAGS) $(APP_LDFLAGS)
 
 $(BUILD_ROOT)/build/application/%.$(OBJ_EXT): %.c
        $(CC) $(CFLAGS) $(APP_CFLAGS) -o $@ -c $<

diff --git a/configure b/configure
index a98decd25f52c41c9d62d510988581e8d07f63e6..7fadcff15f60ad6165bc64aed82f374f01368f3c 100755 (executable)
--- a/configure
+++ b/configure
@@ -239,6 +239,9 @@ __EOF__
 # check languages
 lang_c=
 lang_cpp=
+if detect_c_compiler ; then
+    lang_c=1
+fi
 
 # create buffer for make variables required by dependencies
 echo > "$TEMP_DIR/make.mk"
@@ -323,27 +326,31 @@ TEMP_CXXFLAGS=
 TEMP_LDFLAGS=
 while true
 do
-    if notisplatform "unix"; then
-        break
-    fi
     while true
     do
+        if [ -z "$lang_c" ] ; then
+            ERROR=1
+            break
+        fi
 
-        cat >> "$TEMP_DIR/make.mk" << __EOF__
-OBJ_EXT = o
-LIB_EXT = a
-PACKAGE_SCRIPT = package_unix.sh
-__EOF__
+        TEMP_LDFLAGS="$TEMP_LDFLAGS -lpthread"
         break
     done
     break
 done
 while true
 do
+    if notisplatform "unix"; then
+        break
+    fi
     while true
     do
 
-        TEMP_LDFLAGS="$TEMP_LDFLAGS -lpthread"
+        cat >> "$TEMP_DIR/make.mk" << __EOF__
+OBJ_EXT = o
+LIB_EXT = a
+PACKAGE_SCRIPT = package_unix.sh
+__EOF__
         break
     done
     break

diff --git a/make/project.xml b/make/project.xml
index dce3a78aea6d3f6dc13075339ebd2b653be17c45..178a724570113564546d2abc99b55f44e50a5da1 100644 (file)
--- a/make/project.xml
+++ b/make/project.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://unixwork.de/uwproj">
+       <dependency>
+               <lang>c</lang>
+               <ldflags>-lpthread</ldflags>
+       </dependency>
+
        <dependency name="motif">
                <cflags>-DUI_MOTIF</cflags>
                <ldflags>-lXm -lXt -lX11</ldflags>
@@ -16,10 +21,6 @@
                <pkgconfig>fontconfig</pkgconfig>
        </dependency>
        
-       <dependency>
-               <ldflags>-lpthread</ldflags>
-       </dependency>
-       
        <dependency platform="bsd">
                <cflags>-I/usr/local/include</cflags>
                <ldflags>-L/usr/local/lib</ldflags>

diff --git a/make/uwproj.xsd b/make/uwproj.xsd
index b9e474eb5bcab45fe38ac5d6bc0a42512ed822c8..f702701ae1b22228a1b986053c5271d51ac0bb1a 100644 (file)
--- a/make/uwproj.xsd
+++ b/make/uwproj.xsd
@@ -195,11 +195,11 @@
         </xs:annotation>
         <xs:choice minOccurs="0" maxOccurs="unbounded">
             <xs:group ref="TargetDataGroup"/>
-            <xs:element name="desc" type="xs:string"/>
         </xs:choice>
         <xs:attribute name="name" type="xs:string" use="required"/>
         <xs:attribute name="arg" type="xs:string"/>
         <xs:attribute name="default" type="xs:boolean" default="false"/>
+        <xs:element name="desc" type="xs:string"/>
     </xs:complexType>
 
     <xs:complexType name="OptionType">