Revision 47943338

View differences:

build_ul.sh
609 609

  
610 610
#set needed paths to external libraries
611 611
echo "-----"
612
NAPA="$BASE_UL_DIR/../THIRDPARTY-LIBS/NAPA-BASELIBS"
613
echo "path for NAPA base folder set to $NAPA"
612 614
LOCAL_X264=$TEMP_X264
613 615
echo "path for X264 dependancy set to $LOCAL_X264"
614 616
LOCAL_MP3LAME=$TEMP_MP3LAME
......
655 657
cd "$BASE_UL_DIR"
656 658
cd chunker_player
657 659
[ -n "$REBUILD" ] && $MAKE clean
658
LIBEVENT_DIR=$LOCAL_EVENT LOCAL_PTHREAD=$LOCAL_PTHREAD LOCAL_LIBPNG=$LOCAL_LIBPNG LOCAL_LIBICONV=$LOCAL_LIBICONV LOCAL_LIBINTL=$LOCAL_LIBINTL LOCAL_PLIBC=$LOCAL_PLIBC LOCAL_X264=$LOCAL_X264 LOCAL_MP3LAME=$LOCAL_MP3LAME LOCAL_FFMPEG=$LOCAL_FFMPEG LOCAL_BZ2=$LOCAL_BZ2 LOCAL_Z=$LOCAL_Z LOCAL_CONFUSE=$LOCAL_CONFUSE LOCAL_MHD=$LOCAL_MHD LOCAL_ABS_SDL=$LOCAL_ABS_SDL LOCAL_SDLIMAGE=$LOCAL_SDLIMAGE LOCAL_FREETYPE=$LOCAL_FREETYPE LOCAL_SDLTTF=$LOCAL_SDLTTF IO=$IO MAC_OS=$MAC_OS  $MAKE || { echo "Failed to build CHUNKER PLAYER" ; exit 1; }
660
NAPA=$NAPA LIBEVENT_DIR=$LOCAL_EVENT LOCAL_PTHREAD=$LOCAL_PTHREAD LOCAL_LIBPNG=$LOCAL_LIBPNG LOCAL_LIBICONV=$LOCAL_LIBICONV LOCAL_LIBINTL=$LOCAL_LIBINTL LOCAL_PLIBC=$LOCAL_PLIBC LOCAL_X264=$LOCAL_X264 LOCAL_MP3LAME=$LOCAL_MP3LAME LOCAL_FFMPEG=$LOCAL_FFMPEG LOCAL_BZ2=$LOCAL_BZ2 LOCAL_Z=$LOCAL_Z LOCAL_CONFUSE=$LOCAL_CONFUSE LOCAL_MHD=$LOCAL_MHD LOCAL_ABS_SDL=$LOCAL_ABS_SDL LOCAL_SDLIMAGE=$LOCAL_SDLIMAGE LOCAL_FREETYPE=$LOCAL_FREETYPE LOCAL_SDLTTF=$LOCAL_SDLTTF IO=$IO MAC_OS=$MAC_OS  $MAKE || { echo "Failed to build CHUNKER PLAYER" ; exit 1; }
659 661
echo "----------------FINISHED COMPILING CHUNKER PLAYER"
660 662
exit
661 663

  
chunker_player/Makefile
63 63

  
64 64
ifdef PSNR_PUBLICATION
65 65
CPPFLAGS += -DPSNR_PUBLICATION
66
LOCAL_PSNR_CPPFLAGS = -I$(LIBEVENT_DIR)/include
66
LOCAL_PSNR_CPPFLAGS = -I$(LIBEVENT_DIR)/include -I$(NAPA)/include
67 67
LOCAL_PSNR_LDLIBS = $(NAPA)/rep/librep.a $(NAPA)/dclog/libdclog.a $(NAPA)/common/libcommon.a $(NAPA)/ml/libml.a $(LIBEVENT_DIR)/lib/libevent.a
68 68
endif
69 69

  
chunker_player/chunker_player.c
617 617
	if(SilentMode != 3) //mode 3 is without P2P peer process
618 618
	{
619 619

  
620
#ifndef __WIN32__
621

  
622 620
		char* parameters_vector[255];
623 621
		parameters_vector[0] = argv0;
624 622

  
......
640 638
		}
641 639
		parameters_vector[par_count] = NULL;
642 640

  
641
#ifndef __WIN32__
643 642
		int d;
644 643
		int stdoutS, stderrS;
645 644
		FILE* stream;
......
669 668
		dup2(stderrS, STDERR_FILENO);
670 669

  
671 670
		fclose(stream);
672

  
673
		for(i=1; i<par_count; i++)
674
			free(parameters_vector[i]);
675

  
676 671
#else
677 672
		STARTUPINFO sti;
678 673
		SECURITY_ATTRIBUTES sats = { 0 };
......
707 702
		}
708 703
#endif
709 704

  
705
		for(i=1; i<par_count; i++)
706
			free(parameters_vector[i]);
710 707
	}
711 708

  
712 709
#ifdef RESTORE_SCREEN_ON_ZAPPING

Also available in: Unified diff