Attachment #14587 for issue #24588

View | Details | Raw Unified | Return to issue 24588
Collapse All | Expand All




	$(DESTDIRDLL)$/$(MY_DLLPREFIX)prot_uno_uno$(MY_DLLPOSTFIX)

.IF "$(GUI)"=="WNT"	
.IF "$(COM)"=="GCC"
LIBLIST = \
       $(DESTDIRLIB)$/libstore.a       \
       $(DESTDIRLIB)$/libreg.a         \
       $(DESTDIRLIB)$/libsal.a         \
       $(DESTDIRLIB)$/libsalhelper$(UDK_MAJOR)$(COMID).a       \
       $(DESTDIRLIB)$/libcppu.a        \
       $(DESTDIRLIB)$/libcppuhelper$(UDK_MAJOR)$(COMID).a      \
       $(DESTDIRLIB)$/librmcxt.a       \
       $(DESTDIRLIB)$/libstlport_gcc.a
.ELSE
LIBLIST = \
	$(DESTDIRLIB)$/istore.lib 	\
	$(DESTDIRLIB)$/ireg.lib 	\

	LIBLIST += $(DESTDIRLIB)$/stlport_vc7.lib
.ELSE
	LIBLIST += $(DESTDIRLIB)$/stlport_vc6.lib
.ENDIF
.ENDIF
.ENDIF


Lines 5-10 Link Here

(-)odk/prj/d.lst (+1 lines)
5		5
6	..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll	6	..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll
7	..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so	7	..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so
		8	..\%__SRC%\lib\libofficebean.a %_DEST%\lib%_EXT%\libofficebean.a
8	..\%__SRC%\lib\officebean.dylib %_DEST%\lib%_EXT%\officebean.dylib	9	..\%__SRC%\lib\officebean.dylib %_DEST%\lib%_EXT%\officebean.dylib
9		10
10	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"	11	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Lines 20-26 Link Here

(-)odk/source/bean/native/win32/makefile.mk (+4 lines)
20	SHL1TARGET=$(TARGET)	20	SHL1TARGET=$(TARGET)
21	SHL1LIBS= $(SLB)$/$(TARGET).lib	21	SHL1LIBS= $(SLB)$/$(TARGET).lib
22	#SHL1IMPLIB= i$(TARGET)	22	#SHL1IMPLIB= i$(TARGET)
		23	.IF "$(COM)"=="GCC"
		24	SHL1STDLIBS=-ljawt $(SALLIB)
		25	.ELSE
23	SHL1STDLIBS=jawt.lib $(SALLIB)	26	SHL1STDLIBS=jawt.lib $(SALLIB)
		27	.ENDIF
24		28
25	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	29	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
26		30

Lines 329-334 Link Here

(-)odk/util/odk_rules.pmk (+4 lines)
329	+-rm -f $@ >& $(NULLDEV)	329	+-rm -f $@ >& $(NULLDEV)
330	$(GNUCOPY) $(LIBOUT)$/$(@:f) $@	330	$(GNUCOPY) $(LIBOUT)$/$(@:f) $@
331		331
		332	$(DESTDIRLIB)$/%.a : $(LIBOUT)$/%.a
		333	+-rm -f $@ >& $(NULLDEV)
		334	$(GNUCOPY) $(LIBOUT)$/$(@:f) $@
		335
332	$(DIR_CREATE_FLAG) :	336	$(DIR_CREATE_FLAG) :
333	.IF "$(USE_SHELL)" != "4nt"	337	.IF "$(USE_SHELL)" != "4nt"
334	+$(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) \| xargs -n 10 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@	338	+$(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) \| xargs -n 10 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@

Return to issue 24588

Lines 126-131 Link Here

(-)odk/pack/copying/makefile.mk (+12 lines)
126	$(DESTDIRDLL)$/$(MY_DLLPREFIX)prot_uno_uno$(MY_DLLPOSTFIX)	126	$(DESTDIRDLL)$/$(MY_DLLPREFIX)prot_uno_uno$(MY_DLLPOSTFIX)
127		127
128	.IF "$(GUI)"=="WNT"	128	.IF "$(GUI)"=="WNT"
		129	.IF "$(COM)"=="GCC"
		130	LIBLIST = \
		131	$(DESTDIRLIB)$/libstore.a \
		132	$(DESTDIRLIB)$/libreg.a \
		133	$(DESTDIRLIB)$/libsal.a \
		134	$(DESTDIRLIB)$/libsalhelper$(UDK_MAJOR)$(COMID).a \
		135	$(DESTDIRLIB)$/libcppu.a \
		136	$(DESTDIRLIB)$/libcppuhelper$(UDK_MAJOR)$(COMID).a \
		137	$(DESTDIRLIB)$/librmcxt.a \
		138	$(DESTDIRLIB)$/libstlport_gcc.a
		139	.ELSE
129	LIBLIST = \	140	LIBLIST = \
130	$(DESTDIRLIB)$/istore.lib \	141	$(DESTDIRLIB)$/istore.lib \
131	$(DESTDIRLIB)$/ireg.lib \	142	$(DESTDIRLIB)$/ireg.lib \
Lines 139-144 Link Here
139	LIBLIST += $(DESTDIRLIB)$/stlport_vc7.lib	150	LIBLIST += $(DESTDIRLIB)$/stlport_vc7.lib
140	.ELSE	151	.ELSE
141	LIBLIST += $(DESTDIRLIB)$/stlport_vc6.lib	152	LIBLIST += $(DESTDIRLIB)$/stlport_vc6.lib
		153	.ENDIF
142	.ENDIF	154	.ENDIF
143	.ENDIF	155	.ENDIF
144		156