janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 21:57:38 +01:00
Code Activity

defs.mk: Fix glib@mingw and CCONSOLE_DIR

Browse source 
- Fix glib CFLAGS for mingw
- Fix CCONSOLE_DIR
This commit is contained in:
Jan Lindemann 2007-08-26 15:00:36 +00:00 • committed by Jan Lindemann
commit 0d23c13cb8
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
make/defs.mk
View file

@ -619,13 +619,13 @@ LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools
endif endif
ifeq ($(USE_CCONSOLE),true) ifeq ($(USE_CCONSOLE),true)
CCONSOLE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/cconsole /opt/dspider/cconsole)) CCONSOLE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/cconsole /opt/dspider/cconsole))
CCONSOLE_VERSION = $(call cat_version,$(CCONSOLE_DIR)) #CCONSOLE_VERSION = $(call cat_version,$(CCONSOLE_DIR))
RPM_REQUIRES_RUN += cconsole-run >= $(CCONSOLE_VERSION) #RPM_REQUIRES_RUN += cconsole-run >= $(CCONSOLE_VERSION)
RPM_REQUIRES_DEVEL += cconsole-devel >= $(CCONSOLE_VERSION) #RPM_REQUIRES_DEVEL += cconsole-devel >= $(CCONSOLE_VERSION)
USE_YTOOLS = true USE_YTOOLS = true
INCLUDE += -I$(CCONSOLE_DIR)/include INCLUDE += -I$(CCONSOLE_DIR)/include
LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole #LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole
endif endif
ifeq ($(USE_JACKJART),true) ifeq ($(USE_JACKJART),true)
@ -709,25 +709,25 @@ endif
ifeq ($(USE_GLIB),true) ifeq ($(USE_GLIB),true)
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
PROJECT_CFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --cflags glib-2.0) PROJECT_CFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --cflags glib-2.0)
PROJECT_CPPFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --cflags glib-2.0) PROJECT_CPPFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --cflags glib-2.0)
LIBFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --libs glib-2.0) LIBFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --libs glib-2.0)
else
ifeq ($(ARCH),x86_64)
PROJECT_CFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --cflags glib-2.0)
PROJECT_CPPFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --cflags glib-2.0)
LIBFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0)
endif
endif endif
LIBFLAGS += -ldl -lpthread ifeq ($(ARCH),x86_64)
PROJECT_CFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --cflags glib-2.0)
PROJECT_CPPFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --cflags glib-2.0)
LIBFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0)
endif
LIBFLAGS += -ldl -lpthread
else else
LIBFLAGS += -lglib-2.0 INCLUDE += -I$(CROSS_TOOL_DIR)/include/glib-2.0 -I$(CROSS_TOOL_DIR)/lib/glib-2.0/include
LIBFLAGS += -lglib-2.0
endif endif
endif endif
CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE) CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE)
CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE) CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE)
LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS)
RPM_REQUIRES = $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL) RPM_REQUIRES = $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)
NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g') NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')