Skip to content

Commit f817bbf

Browse files
author
Ryan Baxter
committed
UPDATE: more starter stuff
1 parent 4e4168b commit f817bbf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+3376
-15
lines changed

.gitignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
build/
21
desktop.ini
3-
source/thirdparty/
4-
devops/cmake/.vscode/.browse.VC.db
5-
*.dll
6-
devops/scripts/.vscode/.browse.VC.db
7-
devops/.vscode/.browse.VC.db
2+
build/

README.md

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,60 @@
1-
# SquareOne starter project
1+
SquareOne starter project
2+
===========================
3+
4+
*****************************
5+
by Ryan Baxter
26
Free to use - make it better!
7+
*****************************
8+
9+
This project creates a GUI playground for coding in Visual Studio with CMAKE and Qt5.
10+
11+
It is useful for creating self-contained, deployable (zippable) apps. Build a project out of the codebase and thirdparty utilties as required.
312

413
Prerequisites
5-
CMake
6-
Qt5
7-
MSVC
14+
=============
15+
16+
1. CMake `(default: 3.3.1)`
17+
2. Qt5 `(default: 5.11.1)`
18+
3. MSVC `(default: Visual Studio 15 2017 Win64)`
819

9-
by Ryan Baxter
1020

1121
Update software versions in ~\devops\scripts\config.bat
1222

23+
BUILD DIR
24+
=========
25+
26+
*Run build.bat to create the build directory
27+
28+
VS proj
29+
\build\SquareOne.sln
30+
31+
Deployable app:
32+
\build\deploy
33+
\build\deploy\bin\Release\_Main.exe
34+
35+
Generated Code:
36+
\build\generate\exports
37+
\build\generate\include
38+
\build\generate\library
39+
40+
41+
SOURCE DIR
42+
==========
43+
44+
codebase
45+
--------
46+
47+
1. core `Core libraries have no dependencies`
48+
2. models `Module Libraries may depend on Core Libraries`
49+
3. systems `System Libraries may depend on Core and Module Libraries`
50+
51+
projects
52+
--------
53+
54+
create project apps from the codebase
55+
56+
57+
thirdparty
58+
----------
59+
60+
support libraries (if included)

build.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
::@echo off
2-
:: Req: CMAKE in path, QT_DIR set
2+
:: Req: CMAKE in path, QT_DIR set
33

44
set SQUARE=%CD%
55
call "%SQUARE%\devops\scripts\config.bat"
66

7-
::set QT_DIR "C:\Qt\5.8\msvc2015_64\bin"
7+
::set QT_DIR "C:\Qt\5.11.1\msvc2017_64\bin"
88

99
call "%DEVOPS_SCRIPTS%\clean.bat"
1010
call "%DEVOPS_SCRIPTS%\update.bat"

devops/cmake/square-Link.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ macro(Link_Models)
3636
target_link_libraries ( ${PROJECT_NAME}
3737

3838
S2-DragModel
39+
S2-JsonModel
40+
S2-GraphModel
3941
)
4042

4143
endmacro(Link_Models)

source/codebase/models/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
# add_subdirectory(S2-CanvasModel)
12
add_subdirectory(S2-DragModel)
3+
add_subdirectory(S2-GraphModel)
4+
add_subdirectory(S2-JsonModel)
5+
# add_subdirectory(S2-OSGModel)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
project(S2-GraphModel)
2+
3+
Set_Path_Variables()
4+
5+
Export_Library()
6+
7+
Link_Core()
8+
Link_Qt()
9+
10+
Deploy()
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)