diff options
| author | John "Lameguy" Wilbert Villamor <lameguy64@gmail.com> | 2021-11-22 14:40:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 14:40:59 +0800 |
| commit | 45123e1b968d1883fed9b8526157ce2c4bffc4a7 (patch) | |
| tree | d20c80fbd4f5a5d1d3972669625972cea6b3684d /examples/demos | |
| parent | 538f28cfbbbb8163ab8a96de77d6887123856c81 (diff) | |
| parent | 9b00e5f7ff163a8fc6f341dbf237d90c61dadddc (diff) | |
| download | psn00bsdk-45123e1b968d1883fed9b8526157ce2c4bffc4a7.tar.gz | |
Merge pull request #43 from spicyjpeg/cmake
Even more CMake fixes, submodules, pads example
Diffstat (limited to 'examples/demos')
| -rw-r--r-- | examples/demos/n00bdemo/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/demos/n00bdemo/logo.c | 1 | ||||
| -rw-r--r-- | examples/demos/n00bdemo/main.c | 9 |
3 files changed, 9 insertions, 5 deletions
diff --git a/examples/demos/n00bdemo/CMakeLists.txt b/examples/demos/n00bdemo/CMakeLists.txt index 0b51beb..c62c4ef 100644 --- a/examples/demos/n00bdemo/CMakeLists.txt +++ b/examples/demos/n00bdemo/CMakeLists.txt @@ -1,7 +1,7 @@ # PSn00bSDK example CMake script # (C) 2021 spicyjpeg - MPL licensed -cmake_minimum_required(VERSION 3.21) +cmake_minimum_required(VERSION 3.20) if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS}) set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake) @@ -47,4 +47,4 @@ target_include_directories(n00bdemo PRIVATE ${PROJECT_SOURCE_DIR}) add_custom_target(n00bdemo_data DEPENDS data.lzp) add_dependencies(n00bdemo n00bdemo_data) -install(FILES ${PROJECT_BINARY_DIR}/n00bdemo.exe DESTINATION .) +install(FILES ${PROJECT_BINARY_DIR}/n00bdemo.exe TYPE BIN) diff --git a/examples/demos/n00bdemo/logo.c b/examples/demos/n00bdemo/logo.c index d10b5b4..40160e7 100644 --- a/examples/demos/n00bdemo/logo.c +++ b/examples/demos/n00bdemo/logo.c @@ -5,7 +5,6 @@ #include <psxgte.h> #include <psxgpu.h> #include <inline_c.h> -#include "malloc.h" #include "smd.h" #include <lzp/lzp.h> diff --git a/examples/demos/n00bdemo/main.c b/examples/demos/n00bdemo/main.c index ba21d88..d2fe317 100644 --- a/examples/demos/n00bdemo/main.c +++ b/examples/demos/n00bdemo/main.c @@ -32,7 +32,6 @@ #include <lzp/lzp.h> #include <lzp/lzqlp.h> -#include "malloc.h" #include "smd.h" #include "data.h" #include "disp.h" @@ -617,7 +616,13 @@ void transition() { if( comp >= 16 ) break; - + + // FIXME: for some reason this loop glitches out and hangs indefinitely + // in no$psx, *unless* there's a function somewhere that gets called + // with a pointer/string as first argument... wtf. It works fine in + // other emulators. If you are reading this, please help and enlighten + // me. -- spicyjpeg + puts("."); } DrawSync(0); |