snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-19 13:29:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some changes idk

Browse source
This commit is contained in:
DepressedTWM 2026-08-07 00:24:32 +04:00
parent e83fd8aef3
commit 29ffde9935
14 changed files with 72 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.gitignore vendored
View file

@ -6,25 +6,20 @@
*.app
*.bmp
*.lproj
*.tmp
*.vcxproj
*.filters
*.sln
*.user
*.tlog
.vs/
bin/
lib/
*.dir/
x64/
Makefile*
/oneshot
/steamshim_parent/steamshim
__pycache__
/build*
/dist
@ -32,13 +27,11 @@ __pycache__
/release
steamshim_parent/build/
*.out
object_script.*
rpgscript.bat
rpgscript - mklang.bat
*.pot
xScripts.rxdata
.qmake.stash
CMakeCache.txt
CMakeFiles/
@ -48,16 +41,10 @@ conaninfo\.txt
conanbuildinfo\.txt
conan_imports_manifest\.txt
package/
oclint/
steamworks/
build/
.vscode
test.sh
test2.sh
/compile_commands.json
/.cache
*.lock.json

26
CMakeLists.txt
View file

@ -19,6 +19,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_CXX_STANDARD 23)
if(STATIC)
add_compile_options(-static-libgcc -static-libstdc++)
set(ZLIB_USE_STATIC_LIBS ON)
set(OPENSSL_USE_STATIC_LIBS ON)
endif()
@ -185,8 +186,6 @@ endif()
source_group("MKXP Source" FILES ${MAIN_SOURCE} ${MAIN_HEADERS})
## Setup embedded source ##
set(EMBEDDED_INPUT
shader/common.h
shader/transSimple.frag
@ -340,29 +339,6 @@ else()
if(LINUX)
add_compile_options(-fno-plt)
endif()
if(CPU_ARCH MATCHES "x86")
add_compile_options(
-mnoreturn-no-callee-saved-registers
-mrelax-cmpxchg-loop)
elseif(CPU_ARCH MATCHES "arm64")
# TODO: check is it really usefull:3
add_compile_options(
-mlow-precision-recip-sqrt
-mlow-precision-sqrt
-mlow-precision-div
)
elseif(CPU_ARCH MATCHES "ia-64")
# In theory it must make game work better on IA-64?
add_compile_options(
-minline-float-divide-min-latency
-minline-float-divide-max-throughput
-minline-int-divide-min-latency
-minline-int-divide-max-throughput
-minline-sqrt-min-latency
-minline-sqrt-max-throughput
)
endif()
endif()
if(ANDROID)

2
binding-mri/binding-mri.cpp
View file

@ -532,8 +532,6 @@ static void mriBindingExecute(){
* stdio streams on some platforms (eg. Windows) */
int argc = 0;
char **argv = 0;
char options_argv1[] = "oneshot", options_argv2[] = "-ev";
char* options_argv[] = {options_argv1, options_argv2, NULL};
ruby_sysinit(&argc, &argv);
RUBY_INIT_STACK;
ruby_init();

3
changelogs/0.1.2.txt
View file

@ -44,3 +44,6 @@ Added CMake option to build engine with OpenGL ES2 instead Desktop GL(why not?)
Added setting that disable some puzzles(For Wayland users)
PreloadScripts moved to modloader
Deleted Battletest and RPGMaker debug code
glstate Alpha calculation fix backported from MKXP
Added VALUE support in debugwriter.h
When STATIC build option is enabled, enable static libc++ and libgcc

11
src/debugwriter.h
View file

@ -25,6 +25,9 @@
#include <iostream>
#include <sstream>
#include <vector>
#include <ruby.h>
#undef vsnprintf
#undef snprintf
#ifdef __ANDROID__
#include <android/SDL_log.h>
@ -32,8 +35,6 @@
#include <emscripten/console.h>
#endif
/* A cheap replacement for qDebug() */
class Debug{
public:
Debug(){
@ -56,6 +57,12 @@ public:
return *this;
}
template<typename T>
Debug &operator<<(const VALUE &v){
buf << rb_inspect(v);
return *this;
}
~Debug(){
#ifdef __ANDROID__
__android_log_write(ANDROID_LOG_DEBUG, "sunshine", buf.str().c_str());

3
src/glstate.cpp
View file

@ -77,10 +77,9 @@ void GLBlendMode::apply(const BlendType &value){
break;
case BlendSubstraction :
// FIXME Alpha calculation is untested
gl.BlendEquation(GL_FUNC_REVERSE_SUBTRACT);
gl.BlendFuncSeparate(GL_SRC_ALPHA, GL_ONE,
GL_ONE, GL_ONE);
GL_ZERO, GL_ONE);
break;
case BlendMultiply :

4
src/quad.h
View file

@ -67,9 +67,7 @@ struct Quad{
vert[i].color = c;
}
Quad()
: vbo(VBO::gen()),
vboDirty(true){
Quad() : vbo(VBO::gen()), vboDirty(true){
GLMeta::vaoFillInVertexData<Vertex>(vao);
vao.vbo = vbo;
vao.ibo = shState->globalIBO().ibo;

8
toolchain/arch/adapteva_epiphany.cmake Normal file
View file

@ -0,0 +1,8 @@
set(CUSTOM_FLAGS
-mprefer-short-insn-regs
-mcmove
)
string(JOIN " " CUSTOM_FLAGS_STR ${CUSTOM_FLAGS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CUSTOM_FLAGS_STR}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CUSTOM_FLAGS_STR}")

8
toolchain/arch/arc.cmake Normal file
View file

@ -0,0 +1,8 @@
set(CUSTOM_FLAGS
-mcase-vector-pcrel
-mcompact-casesi
)
string(JOIN " " CUSTOM_FLAGS_STR ${CUSTOM_FLAGS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CUSTOM_FLAGS_STR}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CUSTOM_FLAGS_STR}")

9
toolchain/arch/arm64.cmake Normal file
View file

@ -0,0 +1,9 @@
set(CUSTOM_FLAGS
-mlow-precision-recip-sqrt
-mlow-precision-sqrt
-mlow-precision-div
)
string(JOIN " " CUSTOM_FLAGS_STR ${CUSTOM_FLAGS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CUSTOM_FLAGS_STR}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CUSTOM_FLAGS_STR}")

10
toolchain/arch/c-sky.cmake Normal file
View file

@ -0,0 +1,10 @@
set(CUSTOM_FLAGS
-mdsp
-medsp
-mvdsp
-msmart
)
string(JOIN " " CUSTOM_FLAGS_STR ${CUSTOM_FLAGS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CUSTOM_FLAGS_STR}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CUSTOM_FLAGS_STR}")

12
toolchain/arch/ia-64.cmake Normal file
View file

@ -0,0 +1,12 @@
set(CUSTOM_FLAGS
-minline-float-divide-min-latency
-minline-float-divide-max-throughput
-minline-int-divide-min-latency
-minline-int-divide-max-throughput
-minline-sqrt-min-latency
-minline-sqrt-max-throughput
)
string(JOIN " " CUSTOM_FLAGS_STR ${CUSTOM_FLAGS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CUSTOM_FLAGS_STR}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CUSTOM_FLAGS_STR}")

8
toolchain/arch/x86.cmake Normal file
View file

@ -0,0 +1,8 @@
set(CUSTOM_FLAGS
-mnoreturn-no-callee-saved-registers
-mrelax-cmpxchg-loop
)
string(JOIN " " CUSTOM_FLAGS_STR ${CUSTOM_FLAGS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CUSTOM_FLAGS_STR}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CUSTOM_FLAGS_STR}")

6
toolchain/linux_to_windows_mingw_w64.cmake
View file

@ -1,6 +0,0 @@
cmake_minimum_required(VERSION 3.16)
set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_SYSTEM_PROCESSOR x86_64)
set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
set(CMAKE_SYSROOT /usr/x86_64-w64-mingw32)