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

Make it actually compile, please

This commit is contained in:
Timothy Warren 2015-04-09 22:07:59 -04:00
parent da68257b13
commit 0561e531ef
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -10,7 +10,7 @@ PROGRAM_OBJECTS = $(patsubst %.cpp,%.o, $(PROGRAM_SRC))
BASE_FLAGS = -DSCI_LEXER -std=gnu++11 BASE_FLAGS = -DSCI_LEXER -std=gnu++11
LDLIBS = $(TARGET) $(shell wx-config --libs base core aui stc) -lssh2 LDLIBS = $(TARGET) $(shell wx-config --libs base core aui stc adv) -lssh2
WX_CXXFLAGS = $(shell wx-config --cxxflags) $(BASE_FLAGS) WX_CXXFLAGS = $(shell wx-config --cxxflags) $(BASE_FLAGS)
DEV_CXXFLAGS = -g -Wall -Wextra DEV_CXXFLAGS = -g -Wall -Wextra
CXXFLAGS = -Os CXXFLAGS = -Os

4
src/widgets/EditPaneDefinitions.h
View File

@ -6,14 +6,14 @@
#include <wx/stc/stc.h> #include <wx/stc/stc.h>
// EditPane file extension to lexer mapping // EditPane file extension to lexer mapping
map<string,int> TYROLEXER_MAPPING = { /*map<string,int> TYROLEXER_MAPPING = {
{"c", wxSTC_LEX_CPP}, {"c", wxSTC_LEX_CPP},
{"h", wxSTC_LEX_CPP}, {"h", wxSTC_LEX_CPP},
{"cpp", wxSTC_LEX_CPP}, {"cpp", wxSTC_LEX_CPP},
{"cxx", wxSTC_LEX_CPP}, {"cxx", wxSTC_LEX_CPP},
{"py", wxSTC_LEX_PYTHON}, {"py", wxSTC_LEX_PYTHON},
{"php", wxSTC_LEX_PHPSCRIPT} {"php", wxSTC_LEX_PHPSCRIPT}
}; };*/
#endif /* EDITPANEDEFINITIONS_H */ #endif /* EDITPANEDEFINITIONS_H */