diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c1c88c..48168e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.10) project(akgltest LANGUAGES C) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg") +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg") + add_subdirectory(deps/jansson EXCLUDE_FROM_ALL) add_subdirectory(deps/libakerror EXCLUDE_FROM_ALL) add_subdirectory(deps/libakstdlib EXCLUDE_FROM_ALL) diff --git a/assets/tilemap.tmj b/assets/tilemap.tmj index beeed10..3028762 100644 --- a/assets/tilemap.tmj +++ b/assets/tilemap.tmj @@ -35,7 +35,7 @@ { "name":"state", "type":"int", - "value": 24 + "value":24 }], "rotation":0, "type":"actor", @@ -95,7 +95,7 @@ { "columns":48, "firstgid":1, - "image":"../assets/World_A1.png", + "image":"World_A1.png", "imageheight":576, "imagewidth":768, "margin":0, @@ -108,7 +108,7 @@ { "columns":48, "firstgid":1729, - "image":"../assets/World_B.png", + "image":"World_B.png", "imageheight":768, "imagewidth":768, "margin":0, diff --git a/deps/libakerror b/deps/libakerror index be2dba8..7700af0 160000 --- a/deps/libakerror +++ b/deps/libakerror @@ -1 +1 @@ -Subproject commit be2dba8416d98a3b23f2cd39747fff4275177fc8 +Subproject commit 7700af06a117eceb84c3951a0de5be4a39410ced diff --git a/deps/libakgl b/deps/libakgl index e3edd5b..e03cec1 160000 --- a/deps/libakgl +++ b/deps/libakgl @@ -1 +1 @@ -Subproject commit e3edd5b85575c774acc58ec1056488ffeb556953 +Subproject commit e03cec1c388da349e31af8a4f323c0715f54379c diff --git a/deps/libakstdlib b/deps/libakstdlib index dda645e..a810817 160000 --- a/deps/libakstdlib +++ b/deps/libakstdlib @@ -1 +1 @@ -Subproject commit dda645e188d6740a50f7b9b86ffca20979bc6875 +Subproject commit a8108178ee0afc7e7496d2db119f0602533f511d