just use --libs-only-L for pugixml

enigma-dev · Apr 19, 2018 · 091f584 · 091f584
1 parent cc6ae97
commit 091f584
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CommandLine/emake/Makefile b/CommandLine/emake/Makefile
@@ -29,7 +29,7 @@ ifeq (_$(disable_egm),$(filter _$(disable_egm),_true _1 _yes _y))
 	CXXFLAGS += -DCLI_DISABLE_EGM
 else
 	CXXFLAGS += -I../libEGM -I../libEGM
-	LDFLAGS += $(shell pkg-config --libs pugixml) -lEGM
+	LDFLAGS += -lEGM
 endif
 ifeq (_$(disable_server),$(filter _$(disable_server),_true _1 _yes _y))
 	SOURCES := $(filter-out ./Server.cpp, $(SOURCES))

diff --git a/CommandLine/libEGM/Makefile b/CommandLine/libEGM/Makefile
@@ -30,9 +30,10 @@ obj_dirs: $(OBJDIRS)
 clean:
 	rm -rf $(LIBRARY) $(OBJ_DIR)
 
-# -lpugixml is redundantly specified because the Trusty Tahr package for pugixml does not have a proper pkg-config
+# --libs-only-L is specified because the Trusty Tahr package for pugixml does not have a proper pkg-config
+# hence we only use pkg-config for the lib dirs and just always link pugixml whether in travis, on ubuntu, or in msys2
 $(LIBRARY): $(OBJECTS)
-	$(CXX) -shared -o $@ $^ -lz $(shell pkg-config --libs pugixml) -lpugixml -L../../ -lProtocols -lprotobuf -L../../lodepng -llodepng
+	$(CXX) -shared -o $@ $^ -lz $(shell pkg-config --libs-only-L pugixml) -lpugixml -L../../ -lProtocols -lprotobuf -L../../lodepng -llodepng
 
 # Create the object directories
 $(OBJDIRS):