timw4mail
/
Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix makefile on linux

This commit is contained in:
Timothy Warren 2015-04-07 20:19:05 -04:00
parent 1fb4c44cec
commit d3b129af4d
5 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -31,11 +31,9 @@ $(TARGET): $(OBJECTS)
$(PROGRAM): CXXFLAGS += $(WX_CXXFLAGS) $(TARGET) $(PROGRAM): CXXFLAGS += $(WX_CXXFLAGS) $(TARGET)
$(PROGRAM): $(PROGRAM_OBJECTS) $(PROGRAM):
$(CXX) $(LDLIBS) $(PROGRAM_OBJECTS) -o $(PROGRAM) $(CXX) $(WX_CXXFLAGS) $(PROGRAM_SRC) $(LDLIBS) -o $(PROGRAM)
$(PROGRAM_OBJECTS):
$(CXX) $(WX_CXXFLAGS) $(PROGRAM_SRC)
run: run:
./build/Tyro ./build/Tyro

4
src/network/SFTP.cpp
View File

@ -19,7 +19,6 @@ SFTP::~SFTP() {
string SFTP::getFile(const char *path) string SFTP::getFile(const char *path)
{ {
string output = ""; string output = "";
fprintf(stderr, "libssh2_sftp_open()!\n");
LIBSSH2_SFTP_HANDLE *sftp_handle; LIBSSH2_SFTP_HANDLE *sftp_handle;
sftp_handle = libssh2_sftp_open(sftp_session, path, LIBSSH2_FXF_READ, 0); sftp_handle = libssh2_sftp_open(sftp_session, path, LIBSSH2_FXF_READ, 0);
@ -30,8 +29,6 @@ string SFTP::getFile(const char *path)
return output; return output;
} }
fprintf(stderr, "libssh2_sftp_open() is done, now receive data!\n");
do { do {
char mem[1024]; char mem[1024];
@ -119,7 +116,6 @@ void SFTP::ssh_connect(const char *host, const char *user, const char *pass, con
void SFTP::sftp_connect() void SFTP::sftp_connect()
{ {
fprintf(stderr, "libssh2_sftp_init()!\n");
sftp_session = libssh2_sftp_init(session); sftp_session = libssh2_sftp_init(session);
if ( ! sftp_session) if ( ! sftp_session)

9
src/network/SFTP.h
View File

@ -12,14 +12,15 @@
#define LIBSSH_STATIC 1 #define LIBSSH_STATIC 1
// libssh2 includes
#include <libssh2.h>
#include <libssh2_sftp.h>
// Socket includes // Socket includes
#include <cstring> #include <cstring>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include <stdio.h>
// libssh2 includes
#include <libssh2.h>
#include <libssh2_sftp.h>
class SFTP { class SFTP {
public: public:

2
src/widgets/MainFrame.cpp
View File

@ -65,7 +65,7 @@ void MainFrame::SetupToolbar()
#include "../../resources/xpm/24/file-empty.xpm" #include "../../resources/xpm/24/file-empty.xpm"
#include "../../resources/xpm/24/folder.xpm" #include "../../resources/xpm/24/folder.xpm"
#include "../../resources/xpm/24/floppy.xpm" #include "../../resources/xpm/24/floppy.xpm"
#include "../../" #include "../../resources/xpm/24/wrench-screwdriver.xpm"
#endif #endif
CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL); CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);

7
src/wx_common.h
View File

@ -1,8 +1,5 @@
/* /**
* File: wx_common.h * Common header for widget classes
* Author: twarren
*
* Created on April 7, 2015, 2:29 PM
*/ */
#ifndef WX_COMMON_H #ifndef WX_COMMON_H