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

Update windows build instructions, More travis-ci tweaking

Browse Source
This commit is contained in:
Tim Warren 2015-05-29 09:13:30 -04:00
parent af33d542b6
commit e689122230
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -37,7 +37,7 @@ endif
# Platform compiler flags # Platform compiler flags
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
CXX = $(shell wx-config --cxx) -D__WXMAC__ CXX = $(shell wx-config --cxx) -D__WXMAC__ -std=c++11
LDLIBS += /usr/local/lib/libssh2.a LDLIBS += /usr/local/lib/libssh2.a
else else
LDLIBS += -lssh2 LDLIBS += -lssh2
@ -45,12 +45,19 @@ endif
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
CXXFLAGS += -static CXXFLAGS += -static
CXX += -std=gnu++11 -I/include -DWIN32 CXX += -std=gnu++11 -Wno-unknown-pragmas -Wno-missing-field-initializers -I/include -DWIN32
LDLIBS += -L/lib -lwsock32 LDLIBS += -L/lib -lwsock32
else endif
ifeq ($(OS),Linux)
CXX += -std=c++11 CXX += -std=c++11
endif endif
# Travis CI workaround
ifeq ($(CI),true)
CXX += -std=gnu++11
endif
CXX += -Iinclude -I. -I/usr/local/include CXX += -Iinclude -I. -I/usr/local/include
ifdef $(DEV) ifdef $(DEV)

3
Windows-Build.md
View File

@ -21,7 +21,8 @@ In order to keep a consistent build system, Tyro is built with MinGW and Msys. T
1. Download the windows [installer](https://www.wxwidgets.org/downloads/) for version 3 1. Download the windows [installer](https://www.wxwidgets.org/downloads/) for version 3
2. Use the MSyS prompt to navigate to the wxWidgets directory 2. Use the MSyS prompt to navigate to the wxWidgets directory
3. Make a new folder, eg. msw-debug, and cd into it. 3. Make a new folder, eg. msw-debug, and cd into it.
4. Run `../configure --disable-shared --enable-debug --disable-compat28 --enable-arttango` in that new directory. 4. Run `export CXXFLAGS="-std=gnu++11 $CXXFLAGS"` to allow usage of C++11 features
5. Run `../configure --disable-shared --enable-debug --disable-compat28` in that new directory.
5. After configure finishes, run `make && make install` in the same folder. 5. After configure finishes, run `make && make install` in the same folder.