Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start using Docker #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM ubuntu:16.04
RUN apt-get update
RUN apt-get --yes install software-properties-common apt-utils
RUN add-apt-repository ppa:ubuntu-toolchain-r/test
RUN apt-get --yes install gcc-4.7 g++-4.7 qt-sdk libasound2-dev
RUN apt-get --yes install pkg-config

# RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.6
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 40 --slave /usr/bin/g++ g++ /usr/bin/g++-4.7
RUN update-alternatives --config gcc
# RUN update-alternatives --config g++
# g++
# g++-4.7
# g++-5
WORKDIR /app
# COPY ./ /
# VOLUME ["/build"]
VOLUME ["/app"]
ENTRYPOINT /bin/bash
# RUN make
# RUN make release
# ENTRYPOINT ["./build/vowelcat"]


# Run me with
# docker build . --tag vowel-cat && docker run --interactive --tty --volume $PWD:/app vowel-cat


3 changes: 3 additions & 0 deletions VowelCat/VowelCat.pro
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ QMAKE_CXXFLAGS += $$(CFLAGS)

LIBS += -lm
LIBS += $(LDFLAGS)

# https://stackoverflow.com/questions/34040791/no-matching-function-for-call-to-connect-qt-5-5
CONFIG += c++11
1 change: 1 addition & 0 deletions VowelCat/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <stdlib.h>

#include <QApplication>
#include <QSplashScreen>

extern "C" {
#include "audio.h"
Expand Down
1 change: 1 addition & 0 deletions VowelCat/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <QFileDialog>
#include <QMainWindow>
#include <QPushButton>
#include <QSignalMapper>
#include <QString>
#include <QTimer>

Expand Down
1 change: 1 addition & 0 deletions VowelCat/phonetic-chart.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <QString>
#include <QVector>
#include <QLabel>

#include "qcustomplot.h"

Expand Down
2 changes: 1 addition & 1 deletion VowelCat/plotter.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ class Plotter : public QObject {

// Stop the plotter and wait for it to finish processing.
void stop();
void newFormant(formant_sample_t f1, formant_sample_t f2);

signals:
void pauseSig();
void newFormant(formant_sample_t f1, formant_sample_t f2);
void newSamples(size_t offset);

private:
Expand Down
1 change: 0 additions & 1 deletion libaudio/audio.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

//***************************
#include <stdlib.h>
#define __USE_POSIX
#include <stdio.h>
#include <stdbool.h>
#include <string.h>
Expand Down