Revision add73b22 build_ul.sh

View differences:

build_ul.sh
163 163
		
164 164
		#build from sources
165 165
		wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.tar.gz
166
		tar zxvf libiconv-1.13.tar.gz; mv libiconv-1.13 libiconv; cd libiconv
166
		tar zxvf libiconv-1.13.tar.gz; mv libiconv-1.13 libiconv; rm -f libiconv-1.13.tar.gz; cd libiconv
167 167
		./configure --enable-static ${HOSTARCH:+--host=$HOSTARCH} --prefix=$LOCAL_LIBICONV
168 168
		make
169 169
		make install
170
		rm -f libiconv-1.13.tar.gz
171 170
	fi
172 171
	LIBSDLIMAGE_FLAGS="$LIBSDLIMAGE_FLAGS -I$LOCAL_LIBICONV/include"
173
	LIBSDLIMAGE_LDFLAGS="$LIBSDLIMAGE_LDFLAGS -L$LOCAL_LIBICONV/lib"
172
	#~ LIBSDLIMAGE_LDFLAGS="$LIBSDLIMAGE_LDFLAGS -L$LOCAL_LIBICONV/lib"
174 173

  
175 174
	LOCAL_LIBINTL="$BASE_UL_DIR/$EXTERN_DIR/libintl/temp_libintl_install_mingw"
176 175
	if [ -f "$LOCAL_LIBINTL/lib/libintl.dll.a" ] || [ -f "$LOCAL_LIBINTL/lib/libintl.a" ]; then
......
181 180
		rm -fR libintl
182 181
		wget http://garr.dl.sourceforge.net/project/gnuwin32/libintl/0.14.4/libintl-0.14.4-lib.zip; unzip -o libintl-0.14.4-lib.zip -d libintl
183 182
		wget http://switch.dl.sourceforge.net/project/gnuwin32/libintl/0.14.4/libintl-0.14.4-bin.zip; unzip -o libintl-0.14.4-bin.zip -d libintl
183
		rm -f libintl-0.14.4-bin.zip; rm -f libintl-0.14.4-lib.zip
184 184
		cd libintl
185 185
		mkdir -p $LOCAL_LIBINTL;
186 186
		mv bin $LOCAL_LIBINTL/; mv lib $LOCAL_LIBINTL/; mv include $LOCAL_LIBINTL/
187 187
		mv man $LOCAL_LIBINTL/; mv share $LOCAL_LIBINTL/
188
		rm -f libintl-0.14.4-bin.zip; rm -f libintl-0.14.4-lib.zip
189 188
		
190 189
		# build from gettext sources
191 190
		#~ rm -fR gettext
......
569 568
		LOCAL_EVENT=`dirname $LOCAL_EVENT_A`/..
570 569
	fi
571 570
fi
571

  
572 572
$MAKE IO=$IO clean
573 573
LOCAL_CURL=$LOCAL_CURL ULPLAYER=$BASE_UL_DIR ULPLAYER_EXTERNAL_LIBS=$EXTERN_DIR LIBEVENT_DIR=$LOCAL_EVENT ML=$ML STATIC=$STATIC MONL=$MONL IO=$IO DEBUG=$DEBUG THREADS=$THREADS $MAKE
574 574

  
......
627 627
	cp napalogo*.bmp napaplayer/
628 628
	cp *.ttf napaplayer/
629 629
	cp "$C_PLAYER_EXE" napaplayer/
630
	cp "$BASE_UL_DIR/../OfferStreamer/$O_TARGET_EXE" napaplayer/offerstreamer
631 630
	if [ -n "$MINGW" ]; then
632
		cp "$LOCAL_LIBICONV/bin/libiconv-2.dll" napaplayer/
631
		cp "$BASE_UL_DIR/../OfferStreamer/$O_TARGET_EXE" napaplayer/
632
	else
633
		cp "$BASE_UL_DIR/../OfferStreamer/$O_TARGET_EXE" napaplayer/offerstreamer
634
	fi
635
	if [ -n "$MINGW" ]; then
636
		cp "$LOCAL_LIBICONV/bin/libiconv-2.dll" napaplayer/libiconv2.dll
633 637
		if [ -f "$LOCAL_LIBINTL/bin/libintl-8.dll" ]; then
634 638
			cp "$LOCAL_LIBINTL/bin/libintl-8.dll" napaplayer/
635 639
		else
636 640
			cp "$LOCAL_LIBINTL/bin/libintl3.dll" napaplayer/libintl-8.dll
637 641
		fi
638 642
		cp "$LOCAL_PLIBC/bin/libplibc-1.dll" napaplayer/
643
		cp "$LOCAL_PTHREAD/bin/pthreadGC2.dll" napaplayer/
639 644
		cp "$LOCAL_ABS_SDL/bin/SDL.dll" napaplayer/
645
		cp player.bat napaplayer/
640 646
		rm -f -r napaplayer.zip
641 647
		zip -r napaplayer napaplayer
642 648
		if [ -s "napaplayer.zip" ]; then

Also available in: Unified diff