Skip to content

Commit 916aea6

Browse files
committed
Updated to work with new version of sdk.
1 parent c8c80a9 commit 916aea6

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
build/
22
build.em/
33
build.stm32/
4+
.vs/
5+
out/

CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Basic parameters; check that these match your project / environment
22
cmake_minimum_required(VERSION 3.8)
33

4-
project(game)
5-
set(32BLIT_PATH "F:/32Blit/32blit-beta/" CACHE PATH "Path to 32blit.cmake")
4+
project(Jumpy-Squirrel)
65
set(PROJECT_SOURCE game.cpp game.hpp)
76
set(PROJECT_DISTRIBS LICENSE README.md)
87

@@ -12,14 +11,15 @@ if(MSVC)
1211
else()
1312
add_compile_options("-Wall" "-Wextra" "-Wdouble-promotion")
1413
endif()
15-
#if(NOT EXISTS ${32BLIT_PATH}/32blit.cmake)
16-
# message(FATAL_ERROR "Define location of 32Blit API with -D32BLIT_PATH=<path to 32blit.cmake>")
17-
#endif()
14+
find_package (32BLIT CONFIG REQUIRED PATHS ../32blit-sdk)
1815

19-
include (${32BLIT_PATH}/32blit.cmake)
20-
install (FILES ${PROJECT_DISTRIBS} DESTINATION .)
2116
blit_executable (${PROJECT_NAME} ${PROJECT_SOURCE})
2217
blit_assets_yaml (${PROJECT_NAME} assets.yml)
2318
blit_metadata (${PROJECT_NAME} metadata.yml)
2419
add_custom_target (flash DEPENDS ${PROJECT_NAME}.flash)
2520

21+
# setup release packages
22+
install (FILES ${PROJECT_DISTRIBS} DESTINATION .)
23+
set (CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
24+
set (CPACK_GENERATOR "ZIP" "TGZ")
25+
include (CPack)

CMakeSettings.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@
2222
"buildCommandArgs": "",
2323
"ctestCommandArgs": "",
2424
"inheritEnvironments": [ "msvc_x64_x64" ],
25-
"variables": []
25+
"variables": [
26+
{
27+
"name": "32BLIT_DIR",
28+
"value": "F:/32Blit/32blit-sdk",
29+
"type": "PATH"
30+
}
31+
]
2632
}
2733
]
2834
}

metadata.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ splash:
55
file: assets/image.png
66
icon:
77
file: assets/icon.png
8-
version: v1.2.0
8+
version: v1.2.1
99

0 commit comments

Comments
 (0)