sync up changes from the build submitted to Germany
This commit is contained in:
@@ -33,13 +33,8 @@ EXTRA_DIST = *.exp
|
||||
|
||||
CASAROOT = ../..
|
||||
|
||||
if cpu_64
|
||||
CASALIBDIR = $(CASAROOT)/lib64
|
||||
OBJDIR = $(TARGET_CFG)/lib64
|
||||
else
|
||||
CASALIBDIR = $(CASAROOT)/lib
|
||||
OBJDIR = $(TARGET_CFG)/lib
|
||||
endif
|
||||
CASALIBDIR = $(CASAROOT)/$(LIB)
|
||||
OBJDIR = $(TARGET_CFG)/$(LIB)
|
||||
|
||||
BUILD_VER = 1.1.1
|
||||
|
||||
@@ -63,8 +58,8 @@ CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
|
||||
LIBS = -L/$(CASALIBDIR)/$(TARGET_CFG)
|
||||
|
||||
LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=micasa_lux.exp \
|
||||
-Wl,-rpath -Wl,/usr/lib -L/usr/lib -lpthread \
|
||||
-lc -ldl -Wl,-soname -Wl,libmicasa.so.1
|
||||
-lpthread \
|
||||
-ldl -Wl,-soname -Wl,libmicasa.so.1
|
||||
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
|
||||
#COMMON_OBJS = -L/../../c_common/linux/$(OBJDIR) ../../c_common/linux/$(OBJDIR)/sscs_ll.o
|
||||
COMMON_OBJS = $(OBJDIR)/sscs_ll.o
|
||||
|
||||
Reference in New Issue
Block a user