Page MenuHomePhabricator (Chris)
Files F132572

No OneTemporary
Actions

Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 0aa3aff..6ac0bdf 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,72 +1,104 @@
base: core18
name: deerportal
version: "0.8"
summary: Deer Portal" snap
description: Board game where you need to transfer yourself into the Deer God
grade: stable
-confinement: strict
+confinement: devmode
apps:
deerportalsnap:
- command: DeerPortal
+ command: desktop-launch DeerPortal
environment:
DP_DIR: "$SNAP"
plugs:
+ - alsa
- audio-playback
- desktop
- desktop-legacy
# - gsettings
# - home
- opengl
- pulseaudio
- unity7
- wayland
- x11
# - alsa
parts:
-# alsa:
-# after: [alsa-lib, alsa-plugins]
-# alsa-plugins:
-# after: [alsa-lib]
+ desktop-gtk3:
+ build-packages:
+ - libgtk-3-dev
+ make-parameters:
+ - FLAVOR=gtk3
+ plugin: make
+ source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+ source-subdir: gtk
+ stage-packages:
+ - libxkbcommon0
+ - ttf-ubuntu-font-family
+ - dmz-cursor-theme
+ - light-themes
+ - adwaita-icon-theme
+ - gnome-themes-standard
+ - shared-mime-info
+ - libgtk-3-0
+ - libgdk-pixbuf2.0-0
+ - libglib2.0-bin
+ - libgtk-3-bin
+ - unity-gtk3-module
+ - libappindicator3-1
+ - locales-all
+ - xdg-user-dirs
+ - ibus-gtk3
+ - libibus-1.0-5
+
+
source-deerportal:
plugin: cmake
configflags:
- -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_INSTALL_PREFIX=/usr
source: .
source-type: local
# source-depth: 1
build-packages:
- g++
- libsfml-dev
-# - libgl1-mesa-dri
-# - libopenal-dev
-# - libsndio-dev
+ - libgl1-mesa-dri
+ - libopenal-dev
+ - libsndio-dev
+ - libasound2-dev
+ - libasound2-data
# stage-packages:
# - libc6
# - alsa
stage-packages:
+ - alsa
- libasound2
- libflac8
- libfreetype6
- libgl1
- libglvnd0
- libglx0
- libjpeg-turbo8
- libogg0
- libopenal1
- libpng16-16
- libsfml-audio2.4
- libsfml-graphics2.4
- libsfml-system2.4
- libsfml-window2.4
- libsndio6.1
- libvorbis0a
- libvorbisenc2
- libvorbisfile3
- libx11-6
- libxau6
- libxcb1
- libxdmcp6
- libxext6
- libxrandr2
- libxrender1
+ - libasound2-data
+ - libasound2-plugins
+ after: [desktop-gtk3]
+
diff --git a/src/filetools.cpp b/src/filetools.cpp
index c7f563d..e69de29 100644
--- a/src/filetools.cpp
+++ b/src/filetools.cpp
@@ -1,13 +0,0 @@
-#include <string>
-
-static std::string get_full_path(std::string path)
-{
- std::string new_path;
- if ( getenv ( "DP_DIR" ) != NULL )
- {
- new_path = std::string(getenv("DP_DIR")) + path ;
- return new_path;
- }
-
- return path;
-}
diff --git a/src/filetools.h b/src/filetools.h
index 5e1f316..b556d2e 100644
--- a/src/filetools.h
+++ b/src/filetools.h
@@ -1,6 +1,21 @@
#ifndef FILETOOLS_H
#define FILETOOLS_H
-static std::string get_full_path(std::string)
+
+#include <iostream>
+#include <string>
+
+static std::string get_full_path(std::string path)
{
+ std::string new_path;
+ if ( getenv ( "DP_DIR" ) != NULL )
+ {
+ std::cout << "PATH " << new_path;
+ new_path = std::string(getenv("DP_DIR")) + path ;
+ std::cout << "NEW_PATH " << new_path << "\n";
+ return new_path;
+ }
+ std::cout << "PATH " << path << "\n";
+
+ return path;
}
#endif // FILETOOLS_H

File Metadata

Mime Type
text/x-diff
Expires
Tue, Jun 16, 12:52 AM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
72568
Default Alt Text
(3 KB)

Event Timeline