mirror of
https://github.com/DaedalusX64/daedalus.git
synced 2025-04-02 10:21:48 -04:00
Fix some Windows stuff
This commit is contained in:
parent
e5f6729396
commit
32f6c33bb0
5 changed files with 19 additions and 10 deletions
|
@ -30,7 +30,7 @@ else()
|
|||
message("Release Build")
|
||||
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
|
||||
add_compile_definitions(DAEDALUS_CONFIG_VERSION="Release") ## Show the build type in the UI
|
||||
option(DAEDALUS_SILENT "Shhh, no debug console message, on by default" ON)
|
||||
option(DAEDALUS_SILENT "Shhh, no debug console message, on by default" OFF)
|
||||
endif()
|
||||
#Determine Dynarec compatibility and link in appropriate Dynarec
|
||||
#Todo: Move all relevant Dynarec to the Dynarec/arch folder and enable here when correct platform is detected
|
||||
|
|
|
@ -1,11 +1,16 @@
|
|||
add_library(Utility_Win OBJECT
|
||||
CondW32.cpp
|
||||
DISASM86.cpp
|
||||
${PROJECT_SOURCE_DIR}/Source/SysPosix/Utility/IOPosix.cpp
|
||||
ThreadW32.cpp
|
||||
${PROJECT_SOURCE_DIR}/Source/SysPosix/Utility/TimingPosix.cpp
|
||||
${PROJECT_SOURCE_DIR}/Source/SysPosix/Utility/TimingPosix.cpp
|
||||
)
|
||||
|
||||
if(DEBUG)
|
||||
add_library(Utility_Win OBJECT
|
||||
DISASM86.cpp
|
||||
)
|
||||
list(APPEND daed_libs Utility_Win)
|
||||
endif()
|
||||
list(APPEND daed_libs Utility_Win)
|
||||
set(daed_libs ${daed_libs} PARENT_SCOPE)
|
||||
|
||||
|
|
|
@ -19,7 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
|
||||
#include "Base/Types.h"
|
||||
|
||||
#include <cstring>
|
||||
#include <cstdarg>
|
||||
#ifndef DAEDALUS_SILENT
|
||||
/*==============================unasmt.h==============================*/
|
||||
/* Percent tokens in strings:
|
||||
|
|
|
@ -9,14 +9,17 @@
|
|||
|
||||
// 720p is 1.5x multipler
|
||||
// 1440 is 5.3x multilier
|
||||
#ifdef DAEDALUS_POSIX
|
||||
const s16 SCREEN_WIDTH {1920}; // 4 x PSP Resolution
|
||||
const s16 SCREEN_HEIGHT {1080}; // 7 x PSP Resolution
|
||||
constexpr s16 multipler = 4;
|
||||
#elif defined(PSP)
|
||||
#ifdef DAEDALUS_PSP
|
||||
|
||||
const s16 SCREEN_WIDTH {480};
|
||||
const s16 SCREEN_HEIGHT {272};
|
||||
constexpr s16 multipler = 1;
|
||||
|
||||
#else
|
||||
const s16 SCREEN_WIDTH {1920}; // 4 x PSP Resolution
|
||||
const s16 SCREEN_HEIGHT {1080}; // 7 x PSP Resolution
|
||||
constexpr s16 multipler = 4;
|
||||
|
||||
#endif
|
||||
// to do adjust values to suit multiple screens
|
||||
const s16 MENU_TOP {10 * multipler};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
REM This requires several packages to be installed before it will work
|
||||
cmake -G Ninja -B build -DCMAKE_TOOLCHAIN_FILE="C:\Utilities\vcpkg\scripts\buildsystems\vcpkg.cmake" -DCMAKE_INSTALL_PREFIX="."
|
||||
cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE="C:\Utilities\vcpkg\scripts\buildsystems\vcpkg.cmake" -DCMAKE_INSTALL_PREFIX="."
|
||||
ninja -C build/
|
||||
ninja -C build install
|
Loading…
Add table
Reference in a new issue