Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "cmake"]
path = cmake
url = git://github.com/dlech/vala-cmake-modules
url = https://github.com/dlech/vala-cmake-modules
[submodule "doc/sphinx/_html_extra"]
path = doc/sphinx/_html_extra
url = https://github.com/ev3dev/ev3devKit.git
Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ LIBRARY
PACKAGES
${COMMON_PACKAGES}
CUSTOM_VAPIS
bindings/*.vapi
"${CMAKE_CURRENT_SOURCE_DIR}/bindings/*.vapi"
OPTIONS
--target-glib=${TARGET_GLIB}
${GRX3_VAPIDIR_OPTION}
Expand Down Expand Up @@ -236,8 +236,8 @@ if (EV3DEVKIT_BUILD_DEMO)
${DEVICES_DEMO_SOURCE_FILES}
PACKAGES
${EXEC_PACKAGES}
CUSTOM_VAPIS
bindings/*.vapi
CUSTOM_VAPIS
"${CMAKE_CURRENT_SOURCE_DIR}/bindings/*.vapi"
OPTIONS
--target-glib=${TARGET_GLIB}
--vapidir=${CMAKE_CURRENT_BINARY_DIR}
Expand Down Expand Up @@ -271,7 +271,7 @@ if (EV3DEVKIT_BUILD_DEMO)
PACKAGES
${EXEC_PACKAGES}
CUSTOM_VAPIS
bindings/*.vapi
"${CMAKE_CURRENT_SOURCE_DIR}/bindings/*.vapi"
OPTIONS
--target-glib=${TARGET_GLIB}
--vapidir=${CMAKE_CURRENT_BINARY_DIR}
Expand Down Expand Up @@ -306,7 +306,7 @@ if (VALADOC_FOUND)
include (ValadocGenerate)
generate_valadoc (
${LIBRARY_SOURCE_FILES}
bindings/*.vapi
"${CMAKE_CURRENT_SOURCE_DIR}/bindings/*.vapi"
PACKAGE_NAME
${PROJECT_NAME}
PACKAGE_VERSION
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This is currently in the development stages and is unstable.

This project uses git and git submodules.

git clone --recursive git://github.com/ev3dev/ev3devKit
git clone --recursive https://github.com/ev3dev/ev3devKit


## Cross-compiling for the EV3
Expand Down
4 changes: 2 additions & 2 deletions src/ui/Screen.vala
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ namespace Ev3devKit.Ui {
if (context_mem_addr == null)
context = Context.new_full (mode, width, height);
else {
uint8* addr[4];
addr[0] = context_mem_addr;
uint8 addr[4];
addr[0] = *context_mem_addr;
context = Context.new_full (mode, width, height, addr);
Comment on lines +177 to 179
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
uint8 addr[4];
addr[0] = *context_mem_addr;
context = Context.new_full (mode, width, height, addr);
context = Context.new_full (mode, width, height, context_mem_addr);

}
}
Expand Down