diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c53d776..2b0c0849 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ include(CheckIncludeFiles) include(CheckFunctionExists) include(ExternalProject) include(SourceGroupByDir) +include(GetGitRevisionDescription) project(redream) set(CMAKE_C_STANDARD 11) @@ -54,6 +55,15 @@ if(BUILD_LIBRETRO) set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() +#-------------------------------------------------- +# version file +#-------------------------------------------------- + +git_describe(GIT_VERSION --tags) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/core/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/core/version.h @ONLY) + + #-------------------------------------------------- # config file #-------------------------------------------------- @@ -62,7 +72,9 @@ check_include_files(strings.h HAVE_STRINGS_H) check_function_exists(strcasecmp HAVE_STRCASECMP) check_function_exists(strnlen HAVE_STRNLEN) check_function_exists(strnstr HAVE_STRNSTR) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/core/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/core/config.h) + list(APPEND RELIB_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/src) list(APPEND RELIB_DEFS HAVE_CONFIG_H) diff --git a/cmake/GetGitRevisionDescription.cmake b/cmake/GetGitRevisionDescription.cmake new file mode 100644 index 00000000..8ab03bc5 --- /dev/null +++ b/cmake/GetGitRevisionDescription.cmake @@ -0,0 +1,168 @@ +# - Returns a version string from Git +# +# These functions force a re-configure on each git commit so that you can +# trust the values of the variables in your build system. +# +# get_git_head_revision( [ ...]) +# +# Returns the refspec and sha hash of the current head revision +# +# git_describe( [ ...]) +# +# Returns the results of git describe on the source tree, and adjusting +# the output so that it tests false if an error occurs. +# +# git_get_exact_tag( [ ...]) +# +# Returns the results of git describe --exact-match on the source tree, +# and adjusting the output so that it tests false if there was no exact +# matching tag. +# +# git_local_changes() +# +# Returns either "CLEAN" or "DIRTY" with respect to uncommitted changes. +# Uses the return code of "git diff-index --quiet HEAD --". +# Does not regard untracked files. +# +# Requires CMake 2.6 or newer (uses the 'function' command) +# +# Original Author: +# 2009-2010 Ryan Pavlik +# http://academic.cleardefinition.com +# Iowa State University HCI Graduate Program/VRAC +# +# Copyright Iowa State University 2009-2010. +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +if(__get_git_revision_description) + return() +endif() +set(__get_git_revision_description YES) + +# We must run the following at "include" time, not at function call time, +# to find the path to this module rather than the path to a calling list file +get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH) + +function(get_git_head_revision _refspecvar _hashvar) + set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") + set(GIT_DIR "${GIT_PARENT_DIR}/.git") + while(NOT EXISTS "${GIT_DIR}") # .git dir not found, search parent directories + set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}") + get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH) + if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT) + # We have reached the root directory, we are not in git + set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE) + set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE) + return() + endif() + set(GIT_DIR "${GIT_PARENT_DIR}/.git") + endwhile() + # check if this is a submodule + if(NOT IS_DIRECTORY ${GIT_DIR}) + file(READ ${GIT_DIR} submodule) + string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule}) + get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH) + get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE) + endif() + set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data") + if(NOT EXISTS "${GIT_DATA}") + file(MAKE_DIRECTORY "${GIT_DATA}") + endif() + + if(NOT EXISTS "${GIT_DIR}/HEAD") + return() + endif() + set(HEAD_FILE "${GIT_DATA}/HEAD") + configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY) + + configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in" + "${GIT_DATA}/grabRef.cmake" + @ONLY) + include("${GIT_DATA}/grabRef.cmake") + + set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE) + set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE) +endfunction() + +function(git_describe _var) + if(NOT GIT_FOUND) + find_package(Git QUIET) + endif() + get_git_head_revision(refspec hash) + if(NOT GIT_FOUND) + set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) + return() + endif() + if(NOT hash) + set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE) + return() + endif() + + # TODO sanitize + #if((${ARGN}" MATCHES "&&") OR + # (ARGN MATCHES "||") OR + # (ARGN MATCHES "\\;")) + # message("Please report the following error to the project!") + # message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}") + #endif() + + #message(STATUS "Arguments to execute_process: ${ARGN}") + + execute_process(COMMAND + "${GIT_EXECUTABLE}" + describe + ${hash} + ${ARGN} + WORKING_DIRECTORY + "${CMAKE_CURRENT_SOURCE_DIR}" + RESULT_VARIABLE + res + OUTPUT_VARIABLE + out + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + if(NOT res EQUAL 0) + set(out "${out}-${res}-NOTFOUND") + endif() + + set(${_var} "${out}" PARENT_SCOPE) +endfunction() + +function(git_get_exact_tag _var) + git_describe(out --exact-match ${ARGN}) + set(${_var} "${out}" PARENT_SCOPE) +endfunction() + +function(git_local_changes _var) + if(NOT GIT_FOUND) + find_package(Git QUIET) + endif() + get_git_head_revision(refspec hash) + if(NOT GIT_FOUND) + set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) + return() + endif() + if(NOT hash) + set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE) + return() + endif() + + execute_process(COMMAND + "${GIT_EXECUTABLE}" + diff-index --quiet HEAD -- + WORKING_DIRECTORY + "${CMAKE_CURRENT_SOURCE_DIR}" + RESULT_VARIABLE + res + OUTPUT_VARIABLE + out + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + if(res EQUAL 0) + set(${_var} "CLEAN" PARENT_SCOPE) + else() + set(${_var} "DIRTY" PARENT_SCOPE) + endif() +endfunction() diff --git a/cmake/GetGitRevisionDescription.cmake.in b/cmake/GetGitRevisionDescription.cmake.in new file mode 100644 index 00000000..6d8b708e --- /dev/null +++ b/cmake/GetGitRevisionDescription.cmake.in @@ -0,0 +1,41 @@ +# +# Internal file for GetGitRevisionDescription.cmake +# +# Requires CMake 2.6 or newer (uses the 'function' command) +# +# Original Author: +# 2009-2010 Ryan Pavlik +# http://academic.cleardefinition.com +# Iowa State University HCI Graduate Program/VRAC +# +# Copyright Iowa State University 2009-2010. +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +set(HEAD_HASH) + +file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024) + +string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS) +if(HEAD_CONTENTS MATCHES "ref") + # named branch + string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}") + if(EXISTS "@GIT_DIR@/${HEAD_REF}") + configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY) + else() + configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY) + file(READ "@GIT_DATA@/packed-refs" PACKED_REFS) + if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}") + set(HEAD_HASH "${CMAKE_MATCH_1}") + endif() + endif() +else() + # detached HEAD + configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY) +endif() + +if(NOT HEAD_HASH) + file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024) + string(STRIP "${HEAD_HASH}" HEAD_HASH) +endif() diff --git a/src/core/version.h.in b/src/core/version.h.in new file mode 100644 index 00000000..e7339b16 --- /dev/null +++ b/src/core/version.h.in @@ -0,0 +1,6 @@ +#ifndef REDREAM_VERSION_H +#define REDREAM_VERSION_H + +#define GIT_VERSION "@GIT_VERSION@" + +#endif diff --git a/src/guest/pvr/pvr.c b/src/guest/pvr/pvr.c index 7398aa89..a74a0fdd 100644 --- a/src/guest/pvr/pvr.c +++ b/src/guest/pvr/pvr.c @@ -266,11 +266,11 @@ static void pvr_reconfigure_spg(struct pvr *pvr) { pvr->line_clock *= 2; } - const char *mode = "VGA"; + const char *mode = "vga"; if (pvr->SPG_CONTROL->NTSC == 1) { - mode = "NTSC"; + mode = "ntsc"; } else if (pvr->SPG_CONTROL->PAL == 1) { - mode = "PAL"; + mode = "pal"; } LOG_INFO( diff --git a/src/guest/rom/boot.c b/src/guest/rom/boot.c index 6bbf2868..acded170 100644 --- a/src/guest/rom/boot.c +++ b/src/guest/rom/boot.c @@ -48,9 +48,11 @@ static int boot_validate(struct boot *boot) { static int boot_load_rom(struct boot *boot) { const char *filename = boot_bin_path(); + LOG_INFO("boot_load_rom path=%s", filename); + FILE *fp = fopen(filename, "rb"); if (!fp) { - LOG_WARNING("failed to load '%s'", filename); + LOG_WARNING("boot_load_rom failed to open"); return 0; } @@ -59,7 +61,7 @@ static int boot_load_rom(struct boot *boot) { fseek(fp, 0, SEEK_SET); if (size != (int)sizeof(boot->rom)) { - LOG_WARNING("boot rom size mismatch, is %d, expected %d", size, + LOG_WARNING("boot_load_rom size mismatch size=%d expected=%d", size, sizeof(boot->rom)); fclose(fp); return 0; @@ -70,12 +72,10 @@ static int boot_load_rom(struct boot *boot) { fclose(fp); if (!boot_validate(boot)) { - LOG_WARNING("failed to validate boot rom"); + LOG_WARNING("boot_load_rom failed to validate"); return 0; } - LOG_INFO("boot_load_rom loaded '%s'", filename); - return 1; } diff --git a/src/host/sdl_host.c b/src/host/sdl_host.c index 940c9a40..7c1aa882 100644 --- a/src/host/sdl_host.c +++ b/src/host/sdl_host.c @@ -6,6 +6,7 @@ #include "core/profiler.h" #include "core/ringbuf.h" #include "core/time.h" +#include "core/version.h" #include "emulator.h" #include "guest/aica/aica.h" #include "host/host.h" @@ -1008,6 +1009,8 @@ struct host *host_create() { } int main(int argc, char **argv) { + LOG_INFO("redream " GIT_VERSION); + #if PLATFORM_ANDROID const char *appdir = SDL_AndroidGetExternalStoragePath(); fs_set_appdir(appdir); diff --git a/src/imgui.cc b/src/imgui.cc index 4678ed35..98a27ad6 100644 --- a/src/imgui.cc +++ b/src/imgui.cc @@ -247,8 +247,6 @@ static void imgui_update_font_tex(struct imgui *imgui) { return; } - LOG_INFO("imgui_update_font_tex w=%d h=%d", width, height); - font_tex = r_create_texture(imgui->r, PXL_RGBA, FILTER_BILINEAR, WRAP_REPEAT, WRAP_REPEAT, 0, width, height, pixels); io.Fonts->TexID = (void *)(intptr_t)font_tex;