sync up changes from the build submitted to Germany
This commit is contained in:
		| @@ -33,11 +33,7 @@ EXTRA_DIST = $(CXXFILES)  *.h | ||||
|  | ||||
| CASAROOT = ../../.. | ||||
|  | ||||
| if cpu_64 | ||||
| CASALIBDIR = $(CASAROOT)/lib64 | ||||
| else | ||||
| CASALIBDIR = $(CASAROOT)/lib | ||||
| endif | ||||
| CASALIBDIR = $(CASAROOT)/$(LIB) | ||||
|  | ||||
| BUILD_VER = 1.1.1 | ||||
|  | ||||
| @@ -68,21 +64,13 @@ EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_ | ||||
|    -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \ | ||||
|    -DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386  | ||||
| CXX_RESOURCES = | ||||
| LIBS = -lpthread -lc -ldl -L/opt/kde3/lib   | ||||
| LIBS = -lpthread -ldl -L/opt/kde3/lib   | ||||
| LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2  \ | ||||
|         -Wl,-rpath -Wl,/usr/lib -Wl,-soname -Wl,libkwallets_rw.so.1 | ||||
|         -Wl,-soname -Wl,libkwallets_rw.so.1 | ||||
|  | ||||
| if cpu_64 | ||||
| EXTRA_LDFLAGS = -L/usr/lib64 -lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64  | ||||
| else | ||||
| EXTRA_LddDFLAGS = -L/usr/lib -lqt-mt -L/usr/X11R6/lib -L/usr/lib/qt3/lib  | ||||
| endif | ||||
|                                                                                                                              | ||||
| if cpu_64 | ||||
| OBJDIR = ./$(TARGET_CFG)/lib64 | ||||
| else | ||||
| OBJDIR = ./$(TARGET_CFG)/lib | ||||
| endif | ||||
| EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB)  | ||||
|  | ||||
| OBJDIR = ./$(TARGET_CFG)/$(LIB) | ||||
|  | ||||
| OBJS = $(addprefix $(OBJDIR)/, $(CXXFILES:%.cpp=%.o)) | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user