From: Olaf Wintermann Date: Sat, 20 Jul 2024 22:08:33 +0000 (+0200) Subject: fix build X-Git-Url: https://uap-core.de/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fdefault;p=uwplayer.git fix build --- diff --git a/application/Makefile b/application/Makefile index a1bf5ea..b8b7805 100644 --- 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 a98decd..7fadcff 100755 --- 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 dce3a78..178a724 100644 --- a/make/project.xml +++ b/make/project.xml @@ -1,5 +1,10 @@ + + c + -lpthread + + -DUI_MOTIF -lXm -lXt -lX11 @@ -16,10 +21,6 @@ fontconfig - - -lpthread - - -I/usr/local/include -L/usr/local/lib diff --git a/make/uwproj.xsd b/make/uwproj.xsd index b9e474e..f702701 100644 --- a/make/uwproj.xsd +++ b/make/uwproj.xsd @@ -195,11 +195,11 @@ - +