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

Some changes for setup of Windows build

This commit is contained in:
Tim Warren 2015-07-15 17:03:00 -04:00
parent 940513f4c8
commit 9a6f2dd90a
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -14,6 +14,7 @@ if(COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif(COMPILER_SUPPORTS_CXX0X)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
else()
message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")
endif()
@ -24,13 +25,13 @@ include("${wxWidgets_USE_FILE}")
set(wxWidgets_CONFIG_OPTIONS --static)
#libssh2
set(CMAKE_MODULE_PATH ${Tyro_SOURCE_DIR}/cmake)
find_package(LibSSH2 REQUIRED)
if (LIBSSH2_FOUND)
set (INCLUDE_DIRS ${INCLUDE_DIRS} ${LIBSSH2_INCLUDE_DIR})
else (LIBSSH2_FOUND)
message ( FATAL_ERROR "Could not find LibSSH2" )
endif (LIBSSH2_FOUND)
#set(CMAKE_MODULE_PATH ${Tyro_SOURCE_DIR}/cmake)
#find_package(LibSSH2 REQUIRED)
#if (LIBSSH2_FOUND)
# set (INCLUDE_DIRS ${INCLUDE_DIRS} ${LIBSSH2_INCLUDE_DIR})
#else (LIBSSH2_FOUND)
# message ( FATAL_ERROR "Could not find LibSSH2" )
#endif (LIBSSH2_FOUND)
include_directories(${INCLUDE_DIRS})
@ -64,7 +65,7 @@ add_custom_command(
# base library
add_library(BaseLib STATIC
src/base/SFTP.cpp
# src/base/SFTP.cpp
src/settings/Config.cpp)
# widget library
@ -94,7 +95,8 @@ else()
endif()
#link it all
target_link_libraries(Tyro JsonLib BaseLib WidgetLib ${wxWidgets_LIBRARIES} ${Libssh2_LIBRARIES})
target_link_libraries(Tyro JsonLib BaseLib WidgetLib ${wxWidgets_LIBRARIES})
#target_link_libraries(Tyro JsonLib BaseLib WidgetLib ${wxWidgets_LIBRARIES} ${Libssh2_LIBRARIES})
################################################################################
# Tests
@ -107,5 +109,6 @@ file(GLOB test_SRC
)
add_executable(test_runner ${test_SRC})
target_link_libraries(test_runner ${wxWidgets_LIBRARIES} ${Libssh2_LIBRARIES} JsonLib BaseLib WidgetLib)
target_link_libraries(test_runner ${wxWidgets_LIBRARIES} JsonLib BaseLib WidgetLib)
#target_link_libraries(test_runner ${wxWidgets_LIBRARIES} ${Libssh2_LIBRARIES} JsonLib BaseLib WidgetLib)

3
src/widgets/EditPane.cpp
View File

@ -5,7 +5,7 @@
#include "src/widgets/EditPane.h"
extern StringConstMap Glob_lexer_map;
extern wxConfig *Glob_config;
static wxConfig *Glob_config = nullptr;
/**
* Constructor
@ -19,6 +19,7 @@ EditPane::EditPane(
wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size
) : wxStyledTextCtrl (parent, id, pos, size, wxBORDER_NONE)
{
Glob_config = (wxConfig *) wxConfigBase::Get();
lang_config = new LangConfig();
theme_config = new ThemeConfig();