Skip to content

Commit c7e67a5

Browse files
authored
Merge pull request #10 from huckor/develop_wx_3.1.6
Develop wx 3.1.6
2 parents 8109ec8 + 70f1d94 commit c7e67a5

File tree

10 files changed

+17
-8
lines changed

10 files changed

+17
-8
lines changed

.vscode/tasks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"-lSM",
3535
"-lpng",
3636
"-lz",
37-
"-lwxregexu-3.1",
3837
"-ldl",
3938
"-lm",
4039
"-lXtst",
@@ -72,13 +71,14 @@
7271
"WebKit",
7372
"-framework",
7473
"Security",
74+
"-framework",
75+
"QuartzCore",
7576
"-lwx_osx_cocoau_core-3.1",
7677
"-lwx_baseu-3.1",
7778
"-lwxtiff-3.1",
7879
"-lwxjpeg-3.1",
7980
"-lwxpng-3.1",
8081
"-lwxregexu-3.1",
81-
"-lwxzlib-3.1",
8282
"-lz",
8383
"-lpthread",
8484
"-liconv",

README.md

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,22 @@
22
wxWidgets "Hello World" project made in Visual Studio Code. Can be used for making Windows, Linux and macOS GUI applications using C++ language. Project support compiling & debugging & intellisense in Visual Studio Code.
33
Motivation for make this project was to use one IDE and one source code for all 3 major OS's.
44

5-
## This is branch for wxWidgets 3.1.4 and later
6-
It means you have to use it with wxWidgets 3.1.4 or newer.
7-
In case you want to use wxWidgets 3.0.5 then switch to wx_3.0.5_v2 release or to develop_wx_3.0.5 branch.
5+
## Different versions of wxWidgets
6+
This Visual Studio Code project keep changing because wxWidgets are in active development. For this reason I'm keeping few permanent branches in this repository. You need to pick correct branch or release according wxWidgets version you decide to use.
7+
8+
**Pick according this list**
9+
10+
- wxWidgets 3.1.6:
11+
[Git Branch](https://github.com/huckor/wxwidgets-vscode/tree/develop_wx_3.1.6)
12+
13+
- wxWidgets 3.1.4 or 3.1.5:
14+
[Git Branch](https://github.com/huckor/wxwidgets-vscode/tree/develop_wx_3.1.5) or [Release](https://github.com/huckor/wxwidgets-vscode/releases/tag/wx_3.1.4_v2)
15+
16+
- wxWidgets 3.0.5:
17+
[Git Branch](https://github.com/huckor/wxwidgets-vscode/tree/develop_wx_3.0.5) or [Release](https://github.com/huckor/wxwidgets-vscode/releases/tag/wx_3.0.5_v2)
818

919
## Prerequisites
10-
1. Install Visual Studio Code with C/C++ extension for VS Code. You can follow this official tutorial: https://code.visualstudio.com/docs/cpp/config-mingw
20+
1. Install Visual Studio Code with C/C++ extension for VS Code. You can follow this [official tutorial](https://code.visualstudio.com/docs/cpp/config-mingw)
1121

1222
2. wxWidgets have to be compiled before you'll be able to compile this project. See /doc folder for info how to do it. There is separate pdf document per Operating System.
1323
Project is using wxWidgets libraries from folders structure as it's explained in /doc folder. In case you use different folders structure you need to modify tasks.json, launch.json and c_cpp_properties.json.
@@ -21,5 +31,4 @@ MacOS project possibly require few changes in tasks.json file in case you used d
2131
* Or in vscode select Terminal -> Run Build Task ...
2232

2333
## What's new
24-
* Added document for wxwidgets compilation for Raspbian OS running on ARM Raspberry Pi hardware.
25-
* Added support for multiple source code files and folders. All source code files and folders has to be inside src folder.
34+
* Update project to comply with wxWidgets 3.1.6

doc/linux.pages

2.99 KB
Binary file not shown.

doc/linux.pdf

118 Bytes
Binary file not shown.

doc/mac.pages

-420 Bytes
Binary file not shown.

doc/mac.pdf

-3 Bytes
Binary file not shown.

doc/raspbian.pages

-467 Bytes
Binary file not shown.

doc/raspbian.pdf

6 Bytes
Binary file not shown.

doc/win.pages

2.88 KB
Binary file not shown.

doc/win.pdf

-9.41 KB
Binary file not shown.

0 commit comments

Comments
 (0)