mirror of
https://gitlab.com/dosowisko.net/libsuperderpy.git
synced 2025-02-07 21:56:44 +01:00
fix whitespace style
This commit is contained in:
Sebastian Krzyszkowiak
parent
e9bd4eefa5
commit
505de9086d
4 changed files with 150 additions and 150 deletions
|
|
@ -1,194 +1,194 @@
|
|||
if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
|
||||
|
||||
add_definitions(-D_XOPEN_SOURCE=600)
|
||||
add_definitions(-D_XOPEN_SOURCE=600)
|
||||
|
||||
add_definitions(-DLIBSUPERDERPY_ORIENTATION_${LIBSUPERDERPY_ORIENTATION}=true)
|
||||
add_definitions(-DLIBSUPERDERPY_ORIENTATION_${LIBSUPERDERPY_ORIENTATION}=true)
|
||||
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=c11")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=c11")
|
||||
|
||||
if(APPLE)
|
||||
if(CMAKE_INSTALL_PREFIX MATCHES "/usr/local")
|
||||
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}")
|
||||
set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
|
||||
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIBSUPERDERPY_GAMENAME}.app/Contents/MacOS/")
|
||||
endif(CMAKE_INSTALL_PREFIX MATCHES "/usr/local")
|
||||
if(APPLE)
|
||||
if(CMAKE_INSTALL_PREFIX MATCHES "/usr/local")
|
||||
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}")
|
||||
set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
|
||||
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIBSUPERDERPY_GAMENAME}.app/Contents/MacOS/")
|
||||
endif(CMAKE_INSTALL_PREFIX MATCHES "/usr/local")
|
||||
|
||||
set(MACOSX_BUNDLE_ICON_FILE ${LIBSUPERDERPY_GAMENAME})
|
||||
set(MACOSX_BUNDLE_BUNDLE_NAME ${LIBSUPERDERPY_GAMENAME_PRETTY})
|
||||
set(MACOSX_BUNDLE_ICON_FILE ${LIBSUPERDERPY_GAMENAME})
|
||||
set(MACOSX_BUNDLE_BUNDLE_NAME ${LIBSUPERDERPY_GAMENAME_PRETTY})
|
||||
|
||||
endif(APPLE)
|
||||
endif(APPLE)
|
||||
|
||||
include_directories("libsuperderpy/src")
|
||||
include_directories("libsuperderpy/src")
|
||||
|
||||
if(MINGW)
|
||||
# Guess MINGDIR from the value of CMAKE_C_COMPILER if it's not set.
|
||||
if(NOT MINGDIR)
|
||||
if("$ENV{MINGDIR}" STREQUAL "")
|
||||
string(REGEX REPLACE "/bin/[^/]*$" "" MINGDIR "${CMAKE_C_COMPILER}")
|
||||
message(STATUS "Guessed MinGW directory: ${MINGDIR}")
|
||||
else("$ENV{MINGDIR}" STREQUAL "")
|
||||
file(TO_CMAKE_PATH "$ENV{MINGDIR}" MINGDIR)
|
||||
message(STATUS "Using MINGDIR: ${MINGDIR}")
|
||||
endif("$ENV{MINGDIR}" STREQUAL "")
|
||||
endif(NOT MINGDIR)
|
||||
if(MINGW)
|
||||
# Guess MINGDIR from the value of CMAKE_C_COMPILER if it's not set.
|
||||
if(NOT MINGDIR)
|
||||
if("$ENV{MINGDIR}" STREQUAL "")
|
||||
string(REGEX REPLACE "/bin/[^/]*$" "" MINGDIR "${CMAKE_C_COMPILER}")
|
||||
message(STATUS "Guessed MinGW directory: ${MINGDIR}")
|
||||
else("$ENV{MINGDIR}" STREQUAL "")
|
||||
file(TO_CMAKE_PATH "$ENV{MINGDIR}" MINGDIR)
|
||||
message(STATUS "Using MINGDIR: ${MINGDIR}")
|
||||
endif("$ENV{MINGDIR}" STREQUAL "")
|
||||
endif(NOT MINGDIR)
|
||||
|
||||
# Search in MINGDIR for headers and libraries.
|
||||
set(CMAKE_PREFIX_PATH "${MINGDIR}")
|
||||
# Search in MINGDIR for headers and libraries.
|
||||
set(CMAKE_PREFIX_PATH "${MINGDIR}")
|
||||
|
||||
endif(MINGW)
|
||||
endif(MINGW)
|
||||
|
||||
set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib/${LIBSUPERDERPY_GAMENAME}:\$ORIGIN/gamestates:\$ORIGIN:\$ORIGIN/../lib:\$ORIGIN/lib:\$ORIGIN/bin")
|
||||
set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib/${LIBSUPERDERPY_GAMENAME}:\$ORIGIN/gamestates:\$ORIGIN:\$ORIGIN/../lib:\$ORIGIN/lib:\$ORIGIN/bin")
|
||||
|
||||
find_package(Allegro5 REQUIRED)
|
||||
find_package(Allegro5Font REQUIRED)
|
||||
find_package(Allegro5TTF REQUIRED)
|
||||
find_package(Allegro5Primitives REQUIRED)
|
||||
find_package(Allegro5Audio REQUIRED)
|
||||
find_package(Allegro5ACodec REQUIRED)
|
||||
find_package(Allegro5Image REQUIRED)
|
||||
find_package(Allegro5Color REQUIRED)
|
||||
find_package(Allegro5Video REQUIRED)
|
||||
if(APPLE)
|
||||
find_package(Allegro5Main)
|
||||
endif(APPLE)
|
||||
find_package(Allegro5 REQUIRED)
|
||||
find_package(Allegro5Font REQUIRED)
|
||||
find_package(Allegro5TTF REQUIRED)
|
||||
find_package(Allegro5Primitives REQUIRED)
|
||||
find_package(Allegro5Audio REQUIRED)
|
||||
find_package(Allegro5ACodec REQUIRED)
|
||||
find_package(Allegro5Image REQUIRED)
|
||||
find_package(Allegro5Color REQUIRED)
|
||||
find_package(Allegro5Video REQUIRED)
|
||||
if(APPLE)
|
||||
find_package(Allegro5Main)
|
||||
endif(APPLE)
|
||||
|
||||
include_directories(${ALLEGRO5_INCLUDE_DIR} ${ALLEGRO5_FONT_INCLUDE_DIR} ${ALLEGRO5_TTF_INCLUDE_DIR} ${ALLEGRO5_PRIMITIVES_INCLUDE_DIR} ${ALLEGRO5_AUDIO_INCLUDE_DIR} ${ALLEGRO5_ACODEC_INCLUDE_DIR} ${ALLEGRO5_VIDEO_INCLUDE_DIR} ${ALLEGRO5_IMAGE_INCLUDE_DIR})
|
||||
include_directories(${ALLEGRO5_INCLUDE_DIR} ${ALLEGRO5_FONT_INCLUDE_DIR} ${ALLEGRO5_TTF_INCLUDE_DIR} ${ALLEGRO5_PRIMITIVES_INCLUDE_DIR} ${ALLEGRO5_AUDIO_INCLUDE_DIR} ${ALLEGRO5_ACODEC_INCLUDE_DIR} ${ALLEGRO5_VIDEO_INCLUDE_DIR} ${ALLEGRO5_IMAGE_INCLUDE_DIR})
|
||||
|
||||
MACRO(register_gamestate name)
|
||||
MACRO(register_gamestate name)
|
||||
|
||||
add_library("libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" SHARED "${name}")
|
||||
add_library("libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" SHARED "${name}")
|
||||
|
||||
set_target_properties("libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" PROPERTIES PREFIX "")
|
||||
set_target_properties("libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" PROPERTIES PREFIX "")
|
||||
|
||||
target_link_libraries("libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" ${ALLEGRO5_LIBRARIES} ${ALLEGRO5_FONT_LIBRARIES} ${ALLEGRO5_TTF_LIBRARIES} ${ALLEGRO5_PRIMITIVES_LIBRARIES} ${ALLEGRO5_AUDIO_LIBRARIES} ${ALLEGRO5_ACODEC_LIBRARIES} ${ALLEGRO5_VIDEO_LIBRARIES} ${ALLEGRO5_IMAGE_LIBRARIES} ${ALLEGRO5_COLOR_LIBRARIES} m libsuperderpy)
|
||||
target_link_libraries("libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" ${ALLEGRO5_LIBRARIES} ${ALLEGRO5_FONT_LIBRARIES} ${ALLEGRO5_TTF_LIBRARIES} ${ALLEGRO5_PRIMITIVES_LIBRARIES} ${ALLEGRO5_AUDIO_LIBRARIES} ${ALLEGRO5_ACODEC_LIBRARIES} ${ALLEGRO5_VIDEO_LIBRARIES} ${ALLEGRO5_IMAGE_LIBRARIES} ${ALLEGRO5_COLOR_LIBRARIES} m libsuperderpy)
|
||||
|
||||
if (TARGET libsuperderpy-${LIBSUPERDERPY_GAMENAME})
|
||||
target_link_libraries("libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" libsuperderpy-${LIBSUPERDERPY_GAMENAME})
|
||||
ENDIF()
|
||||
if (TARGET libsuperderpy-${LIBSUPERDERPY_GAMENAME})
|
||||
target_link_libraries("libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" libsuperderpy-${LIBSUPERDERPY_GAMENAME})
|
||||
endif()
|
||||
|
||||
install(TARGETS "libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" DESTINATION ${LIB_INSTALL_DIR})
|
||||
install(TARGETS "libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" DESTINATION ${LIB_INSTALL_DIR})
|
||||
|
||||
if (ANDROID)
|
||||
add_dependencies(${LIBSUPERDERPY_GAMENAME}_apk "libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}")
|
||||
endif()
|
||||
if (ANDROID)
|
||||
add_dependencies(${LIBSUPERDERPY_GAMENAME}_apk "libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}")
|
||||
endif()
|
||||
|
||||
ENDMACRO()
|
||||
ENDMACRO()
|
||||
|
||||
MACRO(libsuperderpy_copy EXECUTABLE)
|
||||
MACRO(libsuperderpy_copy EXECUTABLE)
|
||||
|
||||
if (NOT APPLE AND NOT ANDROID)
|
||||
add_custom_command(TARGET "${EXECUTABLE}" PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "../libsuperderpy/src/libsuperderpy${CMAKE_SHARED_LIBRARY_SUFFIX}" $<TARGET_FILE_DIR:${EXECUTABLE}>)
|
||||
endif (NOT APPLE AND NOT ANDROID)
|
||||
if (NOT APPLE AND NOT ANDROID)
|
||||
add_custom_command(TARGET "${EXECUTABLE}" PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "../libsuperderpy/src/libsuperderpy${CMAKE_SHARED_LIBRARY_SUFFIX}" $<TARGET_FILE_DIR:${EXECUTABLE}>)
|
||||
endif (NOT APPLE AND NOT ANDROID)
|
||||
|
||||
ENDMACRO()
|
||||
ENDMACRO()
|
||||
|
||||
include(InstallRequiredSystemLibraries)
|
||||
include(InstallRequiredSystemLibraries)
|
||||
|
||||
if(LIBSUPERDERPY_GAMENAME)
|
||||
configure_file("${CMAKE_SOURCE_DIR}/libsuperderpy/src/defines.h.in" "${CMAKE_BINARY_DIR}/gen/defines.h")
|
||||
include_directories("${CMAKE_BINARY_DIR}/gen")
|
||||
endif(LIBSUPERDERPY_GAMENAME)
|
||||
if(LIBSUPERDERPY_GAMENAME)
|
||||
configure_file("${CMAKE_SOURCE_DIR}/libsuperderpy/src/defines.h.in" "${CMAKE_BINARY_DIR}/gen/defines.h")
|
||||
include_directories("${CMAKE_BINARY_DIR}/gen")
|
||||
endif(LIBSUPERDERPY_GAMENAME)
|
||||
|
||||
if (NOT DEFINED LIBSUPERDERPY_VERSION)
|
||||
set(LIBSUPERDERPY_VERSION "0.1")
|
||||
endif(NOT DEFINED LIBSUPERDERPY_VERSION)
|
||||
if (NOT DEFINED LIBSUPERDERPY_VERSION)
|
||||
set(LIBSUPERDERPY_VERSION "0.1")
|
||||
endif(NOT DEFINED LIBSUPERDERPY_VERSION)
|
||||
|
||||
if (NOT DEFINED LIBSUPERDERPY_RELEASE)
|
||||
set(LIBSUPERDERPY_RELEASE "1")
|
||||
endif(NOT DEFINED LIBSUPERDERPY_RELEASE)
|
||||
if (NOT DEFINED LIBSUPERDERPY_RELEASE)
|
||||
set(LIBSUPERDERPY_RELEASE "1")
|
||||
endif(NOT DEFINED LIBSUPERDERPY_RELEASE)
|
||||
|
||||
MACRO(add_libsuperderpy_target EXECUTABLE_SRC_LIST)
|
||||
if(ANDROID)
|
||||
set(EXECUTABLE game)
|
||||
add_library(${EXECUTABLE} SHARED ${EXECUTABLE_SRC_LIST})
|
||||
MACRO(add_libsuperderpy_target EXECUTABLE_SRC_LIST)
|
||||
if(ANDROID)
|
||||
set(EXECUTABLE game)
|
||||
add_library(${EXECUTABLE} SHARED ${EXECUTABLE_SRC_LIST})
|
||||
|
||||
set(APK_PATH ${CMAKE_BINARY_DIR}/android/bin/${LIBSUPERDERPY_GAMENAME}-debug.apk)
|
||||
set(APK_PATH ${CMAKE_BINARY_DIR}/android/bin/${LIBSUPERDERPY_GAMENAME}-debug.apk)
|
||||
|
||||
add_custom_target(${LIBSUPERDERPY_GAMENAME}_apk ALL
|
||||
DEPENDS ${EXECUTABLE}
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/android"
|
||||
COMMAND ${ANT_COMMAND} debug
|
||||
)
|
||||
add_custom_target(${LIBSUPERDERPY_GAMENAME}_apk ALL
|
||||
DEPENDS ${EXECUTABLE}
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/android"
|
||||
COMMAND ${ANT_COMMAND} debug
|
||||
)
|
||||
|
||||
add_custom_target(install_apk
|
||||
DEPENDS ${LIBSUPERDERPY_GAMENAME}_apk
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/android"
|
||||
COMMAND adb -d install -r ${APK_PATH}
|
||||
)
|
||||
add_custom_target(install_apk
|
||||
DEPENDS ${LIBSUPERDERPY_GAMENAME}_apk
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/android"
|
||||
COMMAND adb -d install -r ${APK_PATH}
|
||||
)
|
||||
|
||||
add_custom_target(run_apk
|
||||
DEPENDS install_apk
|
||||
COMMAND adb -d shell
|
||||
'am start -a android.intent.action.MAIN -n net.dosowisko.${LIBSUPERDERPY_GAMENAME}/.SuperDerpyActivity'
|
||||
)
|
||||
add_custom_target(run_apk
|
||||
DEPENDS install_apk
|
||||
COMMAND adb -d shell
|
||||
'am start -a android.intent.action.MAIN -n net.dosowisko.${LIBSUPERDERPY_GAMENAME}/.SuperDerpyActivity'
|
||||
)
|
||||
|
||||
else(ANDROID)
|
||||
add_executable(${EXECUTABLE} WIN32 MACOSX_BUNDLE ${EXECUTABLE_SRC_LIST})
|
||||
endif(ANDROID)
|
||||
ENDMACRO()
|
||||
else(ANDROID)
|
||||
add_executable(${EXECUTABLE} WIN32 MACOSX_BUNDLE ${EXECUTABLE_SRC_LIST})
|
||||
endif(ANDROID)
|
||||
ENDMACRO()
|
||||
|
||||
if(ANDROID)
|
||||
set(ANDROID_TARGET "android-16" CACHE STRING "What Android target to compile for.")
|
||||
if(ANDROID)
|
||||
set(ANDROID_TARGET "android-16" CACHE STRING "What Android target to compile for.")
|
||||
|
||||
# The android tool on Windows is a batch file wrapper, which cannot be
|
||||
# started by MSYS shell directly. We invoke it via cmd.exe instead.
|
||||
# We don't use the full path to avoid problems with spaces,
|
||||
# and hope that android.bat is somewhere on the PATH.
|
||||
if(ANDROID_TOOL MATCHES "[.]bat$")
|
||||
set(ANDROID_UPDATE_COMMAND
|
||||
cmd.exe /c "android.bat update project -p . -t ${ANDROID_TARGET}")
|
||||
else()
|
||||
set(ANDROID_UPDATE_COMMAND
|
||||
"${ANDROID_TOOL}" update project -p . -t ${ANDROID_TARGET})
|
||||
endif()
|
||||
# The android tool on Windows is a batch file wrapper, which cannot be
|
||||
# started by MSYS shell directly. We invoke it via cmd.exe instead.
|
||||
# We don't use the full path to avoid problems with spaces,
|
||||
# and hope that android.bat is somewhere on the PATH.
|
||||
if(ANDROID_TOOL MATCHES "[.]bat$")
|
||||
set(ANDROID_UPDATE_COMMAND
|
||||
cmd.exe /c "android.bat update project -p . -t ${ANDROID_TARGET}")
|
||||
else()
|
||||
set(ANDROID_UPDATE_COMMAND
|
||||
"${ANDROID_TOOL}" update project -p . -t ${ANDROID_TARGET})
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/android")
|
||||
file(COPY "${CMAKE_SOURCE_DIR}/libsuperderpy/android" DESTINATION "${CMAKE_BINARY_DIR}")
|
||||
file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/android")
|
||||
file(COPY "${CMAKE_SOURCE_DIR}/libsuperderpy/android" DESTINATION "${CMAKE_BINARY_DIR}")
|
||||
|
||||
MACRO(configure_android_file PATH)
|
||||
configure_file("${CMAKE_BINARY_DIR}/android/${PATH}.in" "${CMAKE_BINARY_DIR}/android/${PATH}" ${ARGN})
|
||||
file(REMOVE "${CMAKE_BINARY_DIR}/android/${PATH}.in")
|
||||
ENDMACRO()
|
||||
MACRO(configure_android_file PATH)
|
||||
configure_file("${CMAKE_BINARY_DIR}/android/${PATH}.in" "${CMAKE_BINARY_DIR}/android/${PATH}" ${ARGN})
|
||||
file(REMOVE "${CMAKE_BINARY_DIR}/android/${PATH}.in")
|
||||
ENDMACRO()
|
||||
|
||||
if (LIBSUPERDERPY_ORIENTATION STREQUAL "PORTRAIT")
|
||||
set(LIBSUPERDERPY_ANDROID_ORIENTATION "sensorPortrait")
|
||||
elseif(LIBSUPERDERPY_ORIENTATION STREQUAL "LANDSCAPE")
|
||||
set(LIBSUPERDERPY_ANDROID_ORIENTATION "sensorLandscape")
|
||||
else()
|
||||
set(LIBSUPERDERPY_ANDROID_ORIENTATION "unspecified")
|
||||
endif()
|
||||
if (LIBSUPERDERPY_ORIENTATION STREQUAL "PORTRAIT")
|
||||
set(LIBSUPERDERPY_ANDROID_ORIENTATION "sensorPortrait")
|
||||
elseif(LIBSUPERDERPY_ORIENTATION STREQUAL "LANDSCAPE")
|
||||
set(LIBSUPERDERPY_ANDROID_ORIENTATION "sensorLandscape")
|
||||
else()
|
||||
set(LIBSUPERDERPY_ANDROID_ORIENTATION "unspecified")
|
||||
endif()
|
||||
|
||||
if (NOT DEFINED LIBSUPERDERPY_ANDROID_DEBUGGABLE)
|
||||
set(LIBSUPERDERPY_ANDROID_DEBUGGABLE "true")
|
||||
endif(NOT DEFINED LIBSUPERDERPY_ANDROID_DEBUGGABLE)
|
||||
if (NOT DEFINED LIBSUPERDERPY_ANDROID_DEBUGGABLE)
|
||||
set(LIBSUPERDERPY_ANDROID_DEBUGGABLE "true")
|
||||
endif(NOT DEFINED LIBSUPERDERPY_ANDROID_DEBUGGABLE)
|
||||
|
||||
configure_android_file("AndroidManifest.xml")
|
||||
configure_android_file("localgen.properties")
|
||||
configure_android_file("build.xml" @ONLY)
|
||||
configure_android_file("project.properties" @ONLY)
|
||||
configure_android_file("res/values/strings.xml")
|
||||
configure_android_file("jni/localgen.mk")
|
||||
if (ALLEGRO5_LIBRARIES MATCHES "^.*-debug.*$")
|
||||
configure_file("${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java.debug.in" "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java")
|
||||
else()
|
||||
configure_file("${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java.in" "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java")
|
||||
endif()
|
||||
file(REMOVE "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java.in")
|
||||
file(REMOVE "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java.debug.in")
|
||||
configure_android_file("AndroidManifest.xml")
|
||||
configure_android_file("localgen.properties")
|
||||
configure_android_file("build.xml" @ONLY)
|
||||
configure_android_file("project.properties" @ONLY)
|
||||
configure_android_file("res/values/strings.xml")
|
||||
configure_android_file("jni/localgen.mk")
|
||||
if (ALLEGRO5_LIBRARIES MATCHES "^.*-debug.*$")
|
||||
configure_file("${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java.debug.in" "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java")
|
||||
else()
|
||||
configure_file("${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java.in" "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java")
|
||||
endif()
|
||||
file(REMOVE "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java.in")
|
||||
file(REMOVE "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy/SuperDerpyActivity.java.debug.in")
|
||||
|
||||
file(RENAME "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy" "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/${LIBSUPERDERPY_GAMENAME}")
|
||||
file(RENAME "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/libsuperderpy" "${CMAKE_BINARY_DIR}/android/src/net/dosowisko/${LIBSUPERDERPY_GAMENAME}")
|
||||
|
||||
file(COPY ${ALLEGRO5_LIBS} DESTINATION ${LIBRARY_OUTPUT_PATH})
|
||||
file(COPY "${ANDROID_ALLEGRO_ROOT}/lib/Allegro5.jar" DESTINATION ${LIBRARY_OUTPUT_PATH})
|
||||
file(COPY ${ALLEGRO5_LIBS} DESTINATION ${LIBRARY_OUTPUT_PATH})
|
||||
file(COPY "${ANDROID_ALLEGRO_ROOT}/lib/Allegro5.jar" DESTINATION ${LIBRARY_OUTPUT_PATH})
|
||||
|
||||
file(COPY "${CMAKE_SOURCE_DIR}/data/" DESTINATION "${CMAKE_BINARY_DIR}/android/assets/")
|
||||
file(COPY "${CMAKE_SOURCE_DIR}/data/" DESTINATION "${CMAKE_BINARY_DIR}/android/assets/")
|
||||
|
||||
file(COPY "${CMAKE_SOURCE_DIR}/data/icons/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/res/mipmap/")
|
||||
file(COPY "${CMAKE_SOURCE_DIR}/data/icons/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/res/mipmap/")
|
||||
|
||||
execute_process(COMMAND ${ANDROID_UPDATE_COMMAND} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/android")
|
||||
execute_process(COMMAND ${ANDROID_UPDATE_COMMAND} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/android")
|
||||
|
||||
endif(ANDROID)
|
||||
endif(ANDROID)
|
||||
|
||||
set(LIBSUPERDERPY_CONFIG_INCLUDED 1)
|
||||
set(LIBSUPERDERPY_CONFIG_INCLUDED 1)
|
||||
|
||||
endif (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ SYMBOL_EXPORT struct Game* libsuperderpy_init(int argc, char** argv, const char*
|
|||
al_set_new_display_option(ALLEGRO_OPENGL, true, ALLEGRO_REQUIRE);
|
||||
|
||||
#ifdef LIBSUPERDERPY_ORIENTATION_LANDSCAPE
|
||||
al_set_new_display_option(ALLEGRO_SUPPORTED_ORIENTATIONS, ALLEGRO_DISPLAY_ORIENTATION_LANDSCAPE, ALLEGRO_SUGGEST);
|
||||
al_set_new_display_option(ALLEGRO_SUPPORTED_ORIENTATIONS, ALLEGRO_DISPLAY_ORIENTATION_LANDSCAPE, ALLEGRO_SUGGEST);
|
||||
#elif defined(LIBSUPERDERPY_ORIENTATION_PORTRAIT)
|
||||
al_set_new_display_option(ALLEGRO_SUPPORTED_ORIENTATIONS, ALLEGRO_DISPLAY_ORIENTATION_PORTRAIT, ALLEGRO_SUGGEST);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -46,10 +46,10 @@
|
|||
struct Gamestate;
|
||||
|
||||
struct Viewport {
|
||||
int width; /*!< Actual available width of the drawing canvas. */
|
||||
int height; /*!< Actual available height of the drawing canvas. */
|
||||
float aspect;
|
||||
bool integer_scaling;
|
||||
int width; /*!< Actual available width of the drawing canvas. */
|
||||
int height; /*!< Actual available height of the drawing canvas. */
|
||||
float aspect;
|
||||
bool integer_scaling;
|
||||
};
|
||||
|
||||
/*! \brief Main struct of the game. */
|
||||
|
|
|
|||
|
|
@ -336,8 +336,8 @@ SYMBOL_EXPORT void TM_CleanBackgroundQueue(struct Timeline* timeline) {
|
|||
while (pom!=NULL) {
|
||||
if (*pom->function) (*pom->function)(timeline->game, pom, TM_ACTIONSTATE_DESTROY);
|
||||
if (pom->timer) {
|
||||
al_stop_timer(pom->timer);
|
||||
al_destroy_timer(pom->timer);
|
||||
al_stop_timer(pom->timer);
|
||||
al_destroy_timer(pom->timer);
|
||||
}
|
||||
TM_DestroyArgs(pom->arguments);
|
||||
tmp = pom->next;
|
||||
|
|
|
|||
Loading…
Reference in a new issue