alex/CrossGen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compiles with C++11 now. Used words now contains 4bytes-numbers

Browse Source
This commit is contained in:
Aleksey Lobanov
2015-06-07 13:22:27 +03:00
parent b7451f8db6
commit a5e0efc408
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crossgen.hpp
View File

@@ -11,7 +11,7 @@ typedef std::vector< std::vector<wxChar> > GridType;
typedef std::vector< std::vector<wxChar> > CurGridType; typedef std::vector< std::vector<wxChar> > CurGridType;
// Fisrt index is a word length // Fisrt index is a word length
typedef std::vector< std::vector<wxString> > AllWordsType; typedef std::vector< std::vector<wxString> > AllWordsType;
typedef std::set< size_t > UsedWords; typedef std::set< uint32_t > UsedWords;
struct WordInfo { struct WordInfo {
size_t x; size_t x;

2
wxCrossGen/wxCrossGen.mk
View File

@@ -50,7 +50,7 @@ LibPath := $(LibraryPathSwitch).
AR := /usr/bin/ar rcu AR := /usr/bin/ar rcu
CXX := /usr/bin/g++-4.8 CXX := /usr/bin/g++-4.8
CC := /usr/bin/gcc-4.8 CC := /usr/bin/gcc-4.8
CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors) CXXFLAGS := -std=c++11 -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)
CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors) CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)
ASFLAGS := ASFLAGS :=
AS := /usr/bin/as AS := /usr/bin/as

2
wxCrossGen/wxCrossGen.project
View File

@@ -34,7 +34,7 @@
</VirtualDirectory> </VirtualDirectory>
<Settings Type="Executable"> <Settings Type="Executable">
<GlobalSettings> <GlobalSettings>
<Compiler Options="" C_Options="" Assembler=""> <Compiler Options="-std=c++11" C_Options="" Assembler="">
<IncludePath Value="."/> <IncludePath Value="."/>
<IncludePath Value="../src"/> <IncludePath Value="../src"/>
</Compiler> </Compiler>