Skip to content

Commit

Permalink
disable runtime features via cli args (issue #34)
Browse files Browse the repository at this point in the history
  * recovers gracefully from audio device init failures
  * fixed testaudio caps
  * added Controls->audioToggle
  * added AvCaster::HandleCliParamsTerminating()
  * merged AvCaster::HandleCliParamsPreInit() and AvCaster::HandleCliParamsPostInit()
           into AvCaster::ProcessCliParams()
  * added AvCaster::GetIsChatEnabled() , AvCaster::IsInitialized ,
          AvCaster::GetIsInitialized()
  * removed AvCaster::GetGuiXwinHandle()
  * renamed AvCasterStore->toogleControl() to AvCasterStore->revertControl()
  * renamed Gstreamer::PreviewSink to Gstreamer::PreviewRealSink
  * added Gstreamer::PreviewQueue , Gstreamer::PreviewFauxSink
  * added Gstreamer::AudioAlsaSource , Gstreamer::AudioPulseSource ,
          Gstreamer::AudioJackSource , Gstreamer::AudioTestSource , Gstreamer::AudioCaps
  * added Gstreamer::PreviewXwin
  * added Gstreamer::ReloadConfig()
  * renamed all Gstreamer::Configure*Bin() to Gstreamer::Build*Bin()
  * renamed Gstreamer::ConfigureFauxVideo() to Gstreamer::ConfigureTestVideo()
  * renamed Gstreamer::ConfigureFauxAudio() to Gstreamer::ConfigureFauxSource()
  * removed Gstreamer::ConfigurePipeline() , Gstreamer::ReconfigureBin() ,
            Gstreamer::RecreateBin()
  * added Gstreamer::SetMessageHandler() , Gstreamer::HandleMessage() ,
          Gstreamer::HandleErrorMessage()
  * added Gstreamer::ConfigurePreview() , Gstreamer::ConfigureAudio()
  * removed Gstreamer::DeleteElement() , Gstreamer::DestroyBin() ,
            Gstreamer::RecreateBin()
  * added Gstreamer::RemoveElement() , Gstreamer::DestroyElement()
  * added Gstreamer::GetElementId() , Gstreamer::GetPadId() , Gstreamer::IsInBin()
  * removed Gstreamer::GetVersionMajor() , Gstreamer::GetVersionMinor()
  * connect Gstreamer bins staticly upon init
  * removed Gstreamer::IsPlaying()
  * renamed AVCaster::SetWindowTitle() to AVCaster::RefreshStatus() and
AVCaster::SetStatusL()
  * renamed AvCasterStore->revertControl() to AvCasterStore->deactivateControl()
            and added AvCaster::DeactivateControl()
  • Loading branch information
bill-auger committed Jan 22, 2016
1 parent c412ee0 commit d0426e5
Show file tree
Hide file tree
Showing 50 changed files with 2,758 additions and 2,278 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ script:
- wget $LIBIRCCLIENT_MIRROR/$LIBIRCCLIENTDEV
- sudo dpkg -i $LIBIRCCLIENT
- sudo dpkg -i $LIBIRCCLIENTDEV
- mkdir libircclient
- cp /usr/include/libirc* libircclient/
- sudo mv libircclient/ /usr/include/
- make CONFIG=Release # TARGET_ARCH='-march=x86-64'
- # $BUILD_DIR/build/$PROJECT_NAME --version

Expand Down
4 changes: 2 additions & 2 deletions AvCaster.jucer
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<JUCERPROJECT id="N9TdTc" name="AvCaster" projectType="guiapp" version="0.16.002"
<JUCERPROJECT id="N9TdTc" name="AvCaster" projectType="guiapp" version="0.15.200"
bundleIdentifier="com.bill-auger.AvCaster" includeBinaryInAppConfig="1"
jucerVersion="3.1.1">
<MAINGROUP id="EzgwIT" name="AvCaster">
Expand Down Expand Up @@ -105,7 +105,7 @@
</VS2008>
<LINUX_MAKE targetFolder="Builds/Makefile" extraCompilerFlags="&#96;pkg-config --cflags gstreamer-1.0&#96;"
extraLinkerFlags="&#96;pkg-config --libs gstreamer-1.0&#96;&#10;&#96;pkg-config --libs gstreamer-video-1.0&#96;"
externalLibraries="ircclient">
externalLibraries="">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" libraryPath="" isDebug="1" optimisation="1" targetName="av-caster-dbg"/>
<CONFIGURATION name="Release" libraryPath="" isDebug="0" optimisation="3" targetName="av-caster"/>
Expand Down
8 changes: 4 additions & 4 deletions Builds/MacOSX/AvCaster.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1446,8 +1446,8 @@
"_DEBUG=1",
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.16.002",
"JUCE_APP_VERSION_HEX=0x1002", );
"JUCE_APP_VERSION=0.15.200",
"JUCE_APP_VERSION_HEX=0xfc8", );
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "$(inherited)");
INFOPLIST_FILE = Info.plist;
Expand All @@ -1466,8 +1466,8 @@
"_NDEBUG=1",
"NDEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.16.002",
"JUCE_APP_VERSION_HEX=0x1002", );
"JUCE_APP_VERSION=0.15.200",
"JUCE_APP_VERSION_HEX=0xfc8", );
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "$(inherited)");
Expand Down
4 changes: 2 additions & 2 deletions Builds/MacOSX/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>0.16.002</string>
<string>0.15.200</string>
<key>CFBundleVersion</key>
<string>0.16.002</string>
<string>0.15.200</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
Expand Down
12 changes: 6 additions & 6 deletions Builds/Makefile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH := -march=native
endif

CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_9CCEB774=1" -D "JUCE_APP_VERSION=0.16.002" -D "JUCE_APP_VERSION_HEX=0x1002" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_9CCEB774=1" -D "JUCE_APP_VERSION=0.15.200" -D "JUCE_APP_VERSION_HEX=0xfc8" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 `pkg-config --cflags gstreamer-1.0`
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lircclient `pkg-config --libs gstreamer-1.0` `pkg-config --libs gstreamer-video-1.0`
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt `pkg-config --libs gstreamer-1.0` `pkg-config --libs gstreamer-video-1.0`
LDDEPS :=
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_9CCEB774=1" -D "JUCE_APP_VERSION=0.16.002" -D "JUCE_APP_VERSION_HEX=0x1002" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_9CCEB774=1" -D "JUCE_APP_VERSION=0.15.200" -D "JUCE_APP_VERSION_HEX=0xfc8" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
TARGET := av-caster-dbg
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
Expand All @@ -39,12 +39,12 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH := -march=native
endif

CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_9CCEB774=1" -D "JUCE_APP_VERSION=0.16.002" -D "JUCE_APP_VERSION_HEX=0x1002" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_9CCEB774=1" -D "JUCE_APP_VERSION=0.15.200" -D "JUCE_APP_VERSION_HEX=0xfc8" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 `pkg-config --cflags gstreamer-1.0`
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lircclient `pkg-config --libs gstreamer-1.0` `pkg-config --libs gstreamer-video-1.0`
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt `pkg-config --libs gstreamer-1.0` `pkg-config --libs gstreamer-video-1.0`
LDDEPS :=
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_9CCEB774=1" -D "JUCE_APP_VERSION=0.16.002" -D "JUCE_APP_VERSION_HEX=0x1002" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_9CCEB774=1" -D "JUCE_APP_VERSION=0.15.200" -D "JUCE_APP_VERSION_HEX=0xfc8" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
TARGET := av-caster
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
Expand Down
10 changes: 5 additions & 5 deletions Builds/Packaging/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Maintainer: bill-auger <[email protected]>
pkgname=av-caster
pkgver=0.16.000
pkgver=0.15.200
pkgrel=1
epoch=
pkgdesc="a simple native gStreamer GUI front-end for screencast and webcam streaming"
pkgdesc="A simple native gStreamer GUI for screencast, webcam, and audio streaming"
arch=('i686' 'x86_64')
url="https://github.com/bill-auger/av-caster"
license=('LGPL3')
groups=()
depends=('gstreamer' 'gst-plugins-base' 'gst-plugins-good' 'gst-plugins-bad' 'gst-plugins-ugly')
makedepends=('freeglut' 'gcc' 'alsa-lib' 'curl' 'freetype2' 'jack' 'libx11' 'libxcomposite' 'libxcursor' 'libxinerama' 'libxrandr' 'mesa' 'libircclient')
makedepends=('freeglut' 'gcc' 'alsa-lib' 'curl' 'freetype2' 'jack' 'libx11' 'libxcomposite' 'libxcursor' 'libxinerama' 'libxrandr' 'mesa')
checkdepends=()
optdepends=()
provides=()
Expand All @@ -22,14 +22,14 @@ changelog=
rootdir="$pkgname"-"$pkgver"
source=('https://github.com/bill-auger/av-caster/archive/v'"$pkgver"'.tar.gz')
noextract=()
md5sums=('fa4a3d8eca880f5d7eba42da9588cbb3')
md5sums=('7bad35bea4bc167d603a95e7e3250160')
validpgpkeys=()

#prepare() {}

build() {
cd "$rootdir"/Builds/Makefile/
CONFIG=Release make
make CONFIG=Release
}

#check() { [ -f "$rootdir"/Builds/Makefile/build/av-caster ] }
Expand Down
19 changes: 11 additions & 8 deletions Builds/Packaging/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@
the files contained in this directory are used by the openSUSE Build Service to package binary artifacts and are otherwise not interesting

when merging into master, the current manual routine is as follows (perhaps we can automate some of these):
* create a tag/tarball named as "vMAJOR.MINOR.REV"
* calclulate md5sum for arch package
* update 'pkgver', 'url', and 'md5sums' in Builds/Packaging/PKGBUILD
* update 'Version' and 'Files' in Builds/Packaging/av-caster.dsc (checksum is arbitrary)
* create a tag/tarball of the development branch named as "vMAJOR.MINOR.REV"
* calclulate md5sum of tarball
* update 'pkgver', 'md5sums' in Builds/Packaging/PKGBUILD
* update 'Version' and 'Files' in Builds/Packaging/av-caster.dsc (checksum and size are arbitrary)
* update 'Version' in Builds/Packaging/av-caster.spec
* update 'Path' in Builds/Packaging/_service
* update 'path' in Builds/Packaging/_service
* add to Builds/Packaging/debian.changelog
* update %changelog version in Builds/Packaging/av-caster.spec
* add any new dependencies to Builds/Packaging/av-caster.dsc
* add any new dependencies , package files , or build steps to Builds/Packaging/av-caster.spec
* update '%changelog' date and version in Builds/Packaging/av-caster.spec
* add any new dependencies to 'depends' and/or 'makedepends' in Builds/Packaging/PKGBUILD
* add any new dependencies to 'Build-Depends' in Builds/Packaging/av-caster.dsc
* add any new 'BuildRequires' or 'Requires' , package '%files' , or steps/hooks to Builds/Packaging/av-caster.spec
* add any new package files , or build steps to Builds/Packaging/debian.rules
* commit any of the above changed files to the build server
* repeat any of the above steps as necessary until everything rocks
* update main README.md as necessary, commit everything, and merge development into master
2 changes: 1 addition & 1 deletion Builds/Packaging/_service
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<service name="download_url">
<param name="host">github.com</param>
<param name="protocol">https</param>
<param name="path">/bill-auger/av-caster/archive/v0.16.000.tar.gz</param>
<param name="path">/bill-auger/av-caster/archive/v0.15.200.tar.gz</param>
</service>
</services>
8 changes: 4 additions & 4 deletions Builds/Packaging/av-caster.dsc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Format: 1.0
Source: av-caster
Version: 0.16.000-1
Version: 0.15.200-1
Binary: av-caster
Maintainer: bill-auger <[email protected]>
Homepage: https://github.com/bill-auger/av-caster
Architecture: any
Build-Depends: build-essential, debhelper (>= 4.1.16), libfreetype6-dev, libgstreamer-plugins-base1.0-dev (>= 1.6.0), libircclient-dev, libx11-dev, libxcursor-dev, libxinerama-dev
Build-Depends: build-essential, debhelper (>= 4.1.16), libfreetype6-dev, libgstreamer-plugins-base1.0-dev (>= 1.6.0), libx11-dev, libxcursor-dev, libxinerama-dev
Files:
d57283ebb8157ae919762c58419353c8 133282 v0.16.000.orig.tar.gz
2fecf324a32123b08cefc0f047bca5ee 63176 v0.16.000.diff.tar.gz
d57283ebb8157ae919762c58419353c8 133282 v0.15.200.orig.tar.gz
2fecf324a32123b08cefc0f047bca5ee 63176 v0.15.200.diff.tar.gz
17 changes: 5 additions & 12 deletions Builds/Packaging/av-caster.spec
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@
#

Name: av-caster
Version: 0.16.000
Version: 0.15.200
Release: 1%{?dist}
Summary: A simple native gStreamer GUI for screencast, webcam, and audio streaming
License: LGPL-3.0
URL: https://github.com/bill-auger/av-caster/
Source0: https://github.com/bill-auger/%{name}/archive/v%{version}.tar.gz
BuildRequires: freetype2-devel gcc-c++ libircclient-devel libX11-devel libXinerama-devel libXcursor-devel
Requires: libircclient1
BuildRequires: freetype2-devel gcc-c++ libX11-devel libXinerama-devel libXcursor-devel
%if 0%{?sles_version} || 0%{?suse_version}
BuildRequires: gstreamer-plugins-base-devel
Requires: gstreamer-plugins-good gstreamer-plugins-bad-free gstreamer-plugins-ugly
Expand All @@ -34,33 +33,28 @@ Requires: gstreamer1-plugins-good gstreamer1-plugins-bad-free gstreamer1-pl
%endif

%description
AvCaster is a native GNU/linux appliction built with the JUCE framework
AvCaster is a native GNU/Linux application built with the JUCE framework
and using gStreamer as the media backend. The current version capable of
recording to file or streaming to an RTMP server with screen capture,
webcam overlay, and stereo audio. It is moderately configurable,
with a preset configuration for streaming via livecoding.tv, and allows
custom user-defined configurations to be stored as additional presets.


%prep
%autosetup


%build
cd Builds/Makefile/
make %{?_smp_mflags} CONFIG=Release


%install
mkdir -p %{buildroot}%{_bindir}
mv Builds/Makefile/build/%{name} %{buildroot}%{_bindir}/


%files
%doc
%{_bindir}/%{name}


%post
%if ! 0%{?suse_version}
xdg-desktop-menu forceupdate
Expand All @@ -71,7 +65,6 @@ mv Builds/Makefile/build/%{name} %{buildroot}%{_bindir}/
xdg-desktop-menu forceupdate
%endif


%changelog
* Wed Dec 05 2015 bill-auger
- v0.16.000
* Sat Dec 19 2015 bill-auger
- v0.15.200
6 changes: 3 additions & 3 deletions Builds/Packaging/debian.changelog
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
av-caster (0.16.000) whatever; urgency=medium
av-caster (0.15.200) whatever; urgency=medium

* add chat feature
* add cli switches to disable runtime features

-- bill-auger <[email protected]> Sat, 05 Dec 2015 04:20:42 -0400
-- bill-auger <[email protected]> Sat, 19 Dec 2015 04:20:42 -0400


av-caster (0.15.000) whatever; urgency=medium
Expand Down
4 changes: 2 additions & 2 deletions Builds/Packaging/debian.control
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Build-Depends: debhelper (>= 4.1.16), build-essential, libfreetype6-dev, libgstr
Package: av-caster
Architecture: any
Depends: ${shlibs:Depends}, freeglut3, gstreamer1.0-plugins-bad (>= 1.6.0), gstreamer1.0-plugins-good (>= 1.6.0), gstreamer1.0-plugins-ugly (>= 1.6.0), libfreetype6, libgl1-mesa-glx, libx11-6, libxcomposite1, libxcursor1, libxext6, libxinerama1, libxrender1
Description: A simple native gStreamer GUI for screencast, webcam, and audio streaming
AvCaster is a native GNU/linux appliction built with the JUCE framework
Description: Light-weight native gStreamer GUI for screencast, webcam, and audio streaming.
AvCaster is a native GNU/Linux application built with the JUCE framework
and using gStreamer as the media backend. The current version capable of
recording to file or streaming to an RTMP server with screen capture,
webcam overlay, and stereo audio. It is moderately configurable,
Expand Down
9 changes: 6 additions & 3 deletions Builds/Packaging/debian.rules
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@

PROJECT_NAME = av-caster
BUILD_DIR = Builds/Makefile
PACKAGING_DIR = /usr/src/packages/BUILD/debian/$(PROJECT_NAME)
PACKAGING_DIR=Builds/Packaging
PACKAGE_DIR = /usr/src/packages/BUILD/debian/$(PROJECT_NAME)
ARTIFACTS_DIR = $(BUILD_DIR)/build
OBJECTS_DIR = $(BUILD_DIR)/build/intermediate
PACKAGE_USR_DIR = $(PACKAGING_DIR)/usr
PACKAGE_BIN_DIR = $(PACKAGING_DIR)/usr/bin
PACKAGE_USR_DIR = $(PACKAGE_DIR)/usr
PACKAGE_BIN_DIR = $(PACKAGE_DIR)/usr/bin
PACKAGE_DOC_DIR = $(PACKAGE_USR_DIR)/share/doc/$(PROJECT_NAME)

# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
Expand Down Expand Up @@ -54,6 +56,7 @@ install: build
rm -rf $(OBJECTS_DIR)
mkdir -p $(PACKAGE_USR_DIR)
mv $(ARTIFACTS_DIR) $(PACKAGE_BIN_DIR)
mv $(PACKAGING_DIR)/debian.copyright $(PACKAGE_DOC_DIR)/copyright
# --- end custom part for installing

# Build architecture-independent files here.
Expand Down
14 changes: 13 additions & 1 deletion Builds/Scripts/setup-build-helpers
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

SCRIPTS_DIR="$(dirname "$(readlink -f "$0")")"
PROJECT_DIR=$SCRIPTS_DIR/../../
BASE_INC_DIR=/usr/include
LIBIRC_INC_DIR=$BASE_INC_DIR/libircclient/


cp $SCRIPTS_DIR/cppcheck-filtered $PROJECT_DIR/ ; chmod a+x $PROJECT_DIR/cppcheck-filtered ;
Expand All @@ -10,4 +12,14 @@ cp $SCRIPTS_DIR/mk $PROJECT_DIR/ ; chmod a+x $PROJECT_DIR/mk
cp $SCRIPTS_DIR/mk-clean $PROJECT_DIR/ ; chmod a+x $PROJECT_DIR/mk-clean ;
cp $SCRIPTS_DIR/mk-reset $PROJECT_DIR/ ; chmod a+x $PROJECT_DIR/mk-reset ;

echo "copyied helper scripts to the project root directory - they can be now run from there"
echo "copied helper scripts to the project root directory - they can be now run from there"
exit # TODO: chat feature next version?
if [ -d $LIBIRC_INC_DIR ] ; then
sudo cp $INC_DIR/libircclient.h $LIBIRC_INC_DIR
sudo cp $INC_DIR/libirc_errors.h $LIBIRC_INC_DIR
sudo cp $INC_DIR/libirc_events.h $LIBIRC_INC_DIR
sudo cp $INC_DIR/libirc_options.h $LIBIRC_INC_DIR
sudo cp $INC_DIR/libirc_rfcnumeric.h $LIBIRC_INC_DIR

echo "copied libircclient headers to $LIBIRC_INC_DIR"
fi
4 changes: 2 additions & 2 deletions Builds/VisualStudio2008/AvCaster.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
BufferSecurityCheck=""
DebugInformationFormat="4"
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules"
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=0.16.002;JUCE_APP_VERSION_HEX=0x1002"
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=0.15.200;JUCE_APP_VERSION_HEX=0xfc8"
RuntimeLibrary="1"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
Expand Down Expand Up @@ -88,7 +88,7 @@
InlineFunctionExpansion="1"
StringPooling="true"
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=0.16.002;JUCE_APP_VERSION_HEX=0x1002"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=0.15.200;JUCE_APP_VERSION_HEX=0xfc8"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
Expand Down
6 changes: 3 additions & 3 deletions Builds/VisualStudio2008/resources.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,16,002,0
FILEVERSION 0,15,200,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "FileDescription", "AvCaster\0"
VALUE "FileVersion", "0.16.002\0"
VALUE "FileVersion", "0.15.200\0"
VALUE "ProductName", "AvCaster\0"
VALUE "ProductVersion", "0.16.002\0"
VALUE "ProductVersion", "0.15.200\0"
END
END

Expand Down
4 changes: 2 additions & 2 deletions Builds/VisualStudio2015/AvCaster.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.16.002;JUCE_APP_VERSION_HEX=0x1002;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.15.200;JUCE_APP_VERSION_HEX=0xfc8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down Expand Up @@ -99,7 +99,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.16.002;JUCE_APP_VERSION_HEX=0x1002;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.15.200;JUCE_APP_VERSION_HEX=0xfc8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down
6 changes: 3 additions & 3 deletions Builds/VisualStudio2015/resources.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,16,002,0
FILEVERSION 0,15,200,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "FileDescription", "AvCaster\0"
VALUE "FileVersion", "0.16.002\0"
VALUE "FileVersion", "0.15.200\0"
VALUE "ProductName", "AvCaster\0"
VALUE "ProductVersion", "0.16.002\0"
VALUE "ProductVersion", "0.15.200\0"
END
END

Expand Down
Loading

0 comments on commit d0426e5

Please sign in to comment.