Merging in engine content
This commit is contained in:
parent
f14960d5ab
commit
6945a85c5b
BIN
BeagleRescue.bak
BIN
BeagleRescue.bak
Binary file not shown.
@ -1,12 +0,0 @@
|
||||
<<<<<<< HEAD
|
||||
[Project]
|
||||
CreatedFrom=CMakeLists.txt
|
||||
Manager=KDevCMakeManager
|
||||
Name=BeagleRescue
|
||||
||||||| 8aa7974
|
||||
=======
|
||||
[Project]
|
||||
CreatedFrom=CMakeLists.txt
|
||||
Manager=KDevCMakeManager
|
||||
Name=BeagleRescue.git
|
||||
>>>>>>> a3d13f32a5f0e4e11c618a4c3d524fd52fc0ed08
|
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.25.1)
|
||||
project(BeagleRescue VERSION 1.0.0 )
|
||||
project(KaijuSaveEarth VERSION 1.0.0 )
|
||||
|
||||
#set(CMAKE_CXX_STANDARD 11) # old requirements
|
||||
set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to be used") # new requirements for tileson
|
||||
@ -15,43 +15,13 @@ PKG_SEARCH_MODULE(SDL2MIXER REQUIRED SDL2_mixer>=2.0.0)
|
||||
# Point to our own cmake modules
|
||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sdl2)
|
||||
|
||||
# Find SDL2
|
||||
# find_package(SDL2 REQUIRED)
|
||||
#find_file(SDL2_INCLUDE_DIR NAME SDL.h HINTS SDL2)
|
||||
#find_library(SDL2_LIBRARY NAME SDL2)
|
||||
#find_package(SDL2_image REQUIRED)
|
||||
#find_package(SDL2_mixer REQUIRED)
|
||||
|
||||
#add_subdirectory(libtmx-parser)
|
||||
#add_library(libtmx-parser)
|
||||
# target_sources(libtmx-parser
|
||||
# PRIVATE
|
||||
# $(CMAKE_CURRENT_LIST_DIR)/libtmx-parser/src/base64.h
|
||||
# $(CMAKE_CURRENT_LIST_DIR)/libtmx-parser/src/base64.cpp
|
||||
# $(CMAKE_CURRENT_LIST_DIR)/libtmx-parser/src/tmxparser.cpp
|
||||
# PUBLIC
|
||||
# $(CMAKE_CURRENT_LIST_DIR)/libtmx-parser/src/tmxparser.h
|
||||
# )
|
||||
|
||||
#set(TMXPARSER "tmxparser")
|
||||
#FetchContent_Declare(
|
||||
# tmxparser
|
||||
# GIT_REPOSITORY "https://github.com/halsafar/libtmx-parser"
|
||||
# GIT_TAG "master"
|
||||
# )
|
||||
#FetchContent_MakeAvailable(tmxparser)
|
||||
|
||||
# Add global definitions
|
||||
add_definitions("-Wall")
|
||||
include_directories(${PROJECT_NAME} ${SDL2_INCLUDE_DIRS} ${SDL2IMAGE_INCLUDE_DIRS} ${SDL2MIXER_INCLUDE_DIRS})
|
||||
#add_custom_target(${TMXPARSER})
|
||||
|
||||
# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libtmx-parser/)
|
||||
|
||||
file(GLOB_RECURSE CSOURCES src/cjson/*.c)
|
||||
file(GLOB_RECURSE CPPSOURCES src/*.cpp)
|
||||
# file(GLOB_RECURSE TMXSOURCES libtmx-parser/src/*.cpp)
|
||||
#add_dependencies(${PROJECT_NAME} ${TMXPARSER})
|
||||
|
||||
add_executable(${PROJECT_NAME} ${CSOURCES} ${CPPSOURCES})
|
||||
install(TARGETS ${PROJECT_NAME} DESTINATION bin)
|
||||
|
@ -1,5 +1,5 @@
|
||||
[Project]
|
||||
CreatedFrom=CMakeLists.txt
|
||||
Manager=KDevCMakeManager
|
||||
Name=BeagleRescue
|
||||
Name=KaijuSaveEarth
|
||||
VersionControl=%{VERSIONCONTROLPLUGIN}
|
2
LICENSE
2
LICENSE
@ -1,4 +1,4 @@
|
||||
MIT License Copyright (c) <year> <copyright holders>
|
||||
MIT License Copyright (c) 2023 Alan Youngblood
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
@ -1,7 +1,8 @@
|
||||
# Beagle Rescue Game
|
||||
# Kaiju Save Earth
|
||||
---
|
||||
Global Game Jam 2021 theme: Lost and Found
|
||||
A 2D platformer where you rescue lost puppies
|
||||
Low Rez Jam 2023
|
||||
|
||||
A game where you play as a giant monster (Kaiju) who must save all the humans from destroying themselves and the world by catching them and safely stowing them on your back.
|
||||
|
||||
By:
|
||||
Alan Youngblood
|
||||
Simon Zaleski
|
||||
|
Loading…
Reference in New Issue
Block a user