diff --git a/misc/merger/join.sh b/misc/merger/join.sh index e2078b8..4e82947 100755 --- a/misc/merger/join.sh +++ b/misc/merger/join.sh @@ -6,3 +6,9 @@ cd .. python misc/merger/join.py --template misc/merger/pem_core.h.inl --path . --output misc/merger/out/pem_core.h python misc/merger/join.py --template misc/merger/pem_core.cpp.inl --path . --output misc/merger/out/pem_core.cpp + +#python misc/merger/join.py --template misc/merger/pem_scene.h.inl --path . --output misc/merger/out/pem_scene.h +#python misc/merger/join.py --template misc/merger/pem_scene.cpp.inl --path . --output misc/merger/out/pem_scene.cpp + +#python misc/merger/join.py --template misc/merger/pem_scene.h.inl --path . --output misc/merger/out/pem_scene.h +#python misc/merger/join.py --template misc/merger/pem_scene.cpp.inl --path . --output misc/merger/out/pem_scene.cpp \ No newline at end of file diff --git a/misc/merger/pem_core.cpp.inl b/misc/merger/pem_core.cpp.inl index a09589e..e06146f 100644 --- a/misc/merger/pem_core.cpp.inl +++ b/misc/merger/pem_core.cpp.inl @@ -22,6 +22,13 @@ #include #include +#include "scene/main/scene_string_names.h" +#include "scene/main/node.h" //only so casting works +#include "scene/main/scene_tree.h" +#include "scene/main/control.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" + {{FILE:core/variant/variant.cpp}} {{FILE:core/variant/variant_call.cpp}} diff --git a/misc/merger/pem_core.h.inl b/misc/merger/pem_core.h.inl index cefdd03..f882bde 100644 --- a/misc/merger/pem_core.h.inl +++ b/misc/merger/pem_core.h.inl @@ -75,44 +75,48 @@ SOFTWARE. {{FILE:core/error/error_macros.h}} {{FILE:core/error/error_list.h}} -{{FILE:core/math/transform_interpolator.h}} -{{FILE:core/math/bvh_abb.h}} -{{FILE:core/math/color.h}} -{{FILE:core/math/bsp_tree.h}} -{{FILE:core/math/random_pcg.h}} -{{FILE:core/math/transform_2d.h}} -{{FILE:core/math/bvh.h}} + {{FILE:core/math/math_defs.h}} -{{FILE:core/math/vector2.h}} -{{FILE:core/math/expression.h}} -{{FILE:core/math/random_number_generator.h}} -{{FILE:core/math/quick_hull.h}} -{{FILE:core/math/vector2i.h}} -{{FILE:core/math/convex_hull.h}} -{{FILE:core/math/triangle_mesh.h}} -{{FILE:core/math/geometry.h}} -{{FILE:core/math/quaternion.h}} -{{FILE:core/math/rect2.h}} -{{FILE:core/math/delaunay.h}} -{{FILE:core/math/a_star.h}} -{{FILE:core/math/face3.h}} -{{FILE:core/math/vector4.h}} -{{FILE:core/math/disjoint_set.h}} -{{FILE:core/math/audio_frame.h}} -{{FILE:core/math/bvh_tree.h}} {{FILE:core/math/math_funcs.h}} -{{FILE:core/math/rect2i.h}} -{{FILE:core/math/octree.h}} + +{{FILE:core/math/vector2.h}} +{{FILE:core/math/vector2i.h}} +{{FILE:core/math/vector3.h}} {{FILE:core/math/projection.h}} {{FILE:core/math/aabb.h}} {{FILE:core/math/vector3i.h}} {{FILE:core/math/vector4i.h}} -{{FILE:core/math/math_fieldwise.h}} +{{FILE:core/math/vector4.h}} +{{FILE:core/math/rect2.h}} +{{FILE:core/math/rect2i.h}} +{{FILE:core/math/face3.h}} +{{FILE:core/math/transform_2d.h}} +{{FILE:core/math/quaternion.h}} +{{FILE:core/math/color.h}} {{FILE:core/math/plane.h}} {{FILE:core/math/basis.h}} -{{FILE:core/math/triangulate.h}} + {{FILE:core/math/transform.h}} -{{FILE:core/math/vector3.h}} + +{{FILE:core/math/random_pcg.h}} +{{FILE:core/math/random_number_generator.h}} +{{FILE:core/math/bsp_tree.h}} +{{FILE:core/math/bvh.h}} +{{FILE:core/math/expression.h}} +{{FILE:core/math/quick_hull.h}} +{{FILE:core/math/convex_hull.h}} +{{FILE:core/math/triangle_mesh.h}} +{{FILE:core/math/geometry.h}} +{{FILE:core/math/delaunay.h}} +{{FILE:core/math/a_star.h}} +{{FILE:core/math/disjoint_set.h}} +{{FILE:core/math/audio_frame.h}} +{{FILE:core/math/bvh_tree.h}} +{{FILE:core/math/octree.h}} +{{FILE:core/math/math_fieldwise.h}} +{{FILE:core/math/triangulate.h}} +{{FILE:core/math/transform_interpolator.h}} +{{FILE:core/math/bvh_abb.h}} {{FILE:core/log/logger_backend.h}} {{FILE:core/log/logger.h}} diff --git a/misc/merger/settings b/misc/merger/settings index cf6dd9e..e285d7e 100644 --- a/misc/merger/settings +++ b/misc/merger/settings @@ -28,3 +28,9 @@ g++ -o bin/pandemonium.x11.opt.debug.64 -no-pie -T platform/x11/pck_embed.legacy platform/x11/pandemonium_x11.x11.opt.debug.64.o platform/x11/context_gl_x11.x11.opt.debug.64.o platform/x11/crash_handler_x11.x11.opt.debug.64.o platform/x11/os_x11.x11.opt.debug.64.o platform/x11/key_mapping_x11.x11.opt.debug.64.o platform/x11/joypad_linux.x11.opt.debug.64.o platform/x11/power_x11.x11.opt.debug.64.o platform/x11/detect_prime.x11.opt.debug.64.o platform/x11/libudev-so_wrap.x11.opt.debug.64.o main/libmain.x11.opt.debug.64.a modules/libmodules.x11.opt.debug.64.a platform/libplatform.x11.opt.debug.64.a drivers/libdrivers.x11.opt.debug.64.a scene/libscene.x11.opt.debug.64.a servers/libservers.x11.opt.debug.64.a core/libcore.x11.opt.debug.64.a modules/freetype/libfreetype_builtin.x11.opt.debug.64.a -lXcursor -lXinerama -lXext -lXrandr -lXrender -lX11 -lXi -lGL -lpthread -ldl + + +g++ -o pem_core.o -fno-rtti -std=gnu++14 -O2 -pipe -fpie -fno-exceptions -Wall -Wno-misleading-indentation -Wshadow-local + + +g++ -o misc/merger/out/pem_core.o -c -fno-rtti -std=gnu++14 -O2 -pipe -fpie -fno-exceptions -Wall -Wno-misleading-indentation -Wshadow-local -DNO_SAFE_CAST -DDEBUG_ENABLED -DNDEBUG -DTOUCH_ENABLED -DALSA_ENABLED -DPULSEAUDIO_ENABLED -D_REENTRANT -DJOYDEV_ENABLED -DUDEV_ENABLED -DX11_ENABLED -DUNIX_ENABLED -DOPENGL_ENABLED -DGLES_ENABLED -D_FILE_OFFSET_BITS=64 -DGLAD_ENABLED -DGLES_OVER_GL -DHAVE_MNTENT -I. misc/merger/out/pem_core.cpp \ No newline at end of file