Debian package cpack + icon fix

src/AppFrame.cpp

@@ -40,6 +40,10 @@ wxEND_EVENT_TABLE()
 AppFrame::AppFrame() :
 wxFrame(NULL, wxID_ANY, CUBICSDR_TITLE), activeDemodulator(NULL) {
 
+#ifdef __linux__
+    SetIcon(wxICON(cubicsdr));
+#endif
+
     wxBoxSizer *vbox = new wxBoxSizer(wxVERTICAL);
     wxBoxSizer *demodOpts = new wxBoxSizer(wxVERTICAL);
     wxBoxSizer *demodVisuals = new wxBoxSizer(wxVERTICAL);
@@ -236,9 +240,7 @@ wxFrame(NULL, wxID_ANY, CUBICSDR_TITLE), activeDemodulator(NULL) {
     Centre();
     Show();
 
-#ifdef __linux__
-    SetIcon(wxICON(cubicsdr));
-#endif
+
 #ifdef _WIN32
     SetIcon(wxICON(frame_icon));
 #endif

src/util/GLFont.cpp

@@ -4,6 +4,10 @@
 #include <fstream>
 #include <algorithm>
 
+#ifndef RES_FOLDER
+#define RES_FOLDER ""
+#endif
+
 GLFontChar::GLFontChar() :
         id(0), x(0), y(0), width(0), height(0), xoffset(0), yoffset(0), xadvance(0), aspect(1), index(0) {
 
@@ -149,7 +153,8 @@ std::string GLFont::getParamValue(std::string param_str) {
 }
 
 void GLFont::loadFont(std::string fontFile) {
-    fontFileSource = fontFile;
+    fontFileSource = RES_FOLDER;
+    fontFileSource.append(fontFile);
 
     std::ifstream input;
     input.open(fontFileSource.c_str(), std::ios::in);
@@ -210,7 +215,8 @@ void GLFont::loadFont(std::string fontFile) {
                 std::string paramValue = getParamValue(param);
 
                 if (paramKey == "file") {
-                    imageFile = paramValue;
+                    imageFile = RES_FOLDER;
+                    imageFile.append(paramValue);
                 }
 //                std::cout << "[" << paramKey << "] = '" << paramValue << "'" << std::endl;
             }