From c27321e9f8b45b453acde81e92758299907a227a Mon Sep 17 00:00:00 2001 From: sorket Date: Tue, 11 Jul 2023 21:54:35 -0400 Subject: [PATCH 1/8] annoying warning fix --- Projects/Client/Common/Header/OgreWidget.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projects/Client/Common/Header/OgreWidget.hpp b/Projects/Client/Common/Header/OgreWidget.hpp index a02f5b1..6de001e 100644 --- a/Projects/Client/Common/Header/OgreWidget.hpp +++ b/Projects/Client/Common/Header/OgreWidget.hpp @@ -8,7 +8,7 @@ #include #include #include -#include > +#include #include From 6c131c7ebb45831228cccc58fce5e9727a8408e7 Mon Sep 17 00:00:00 2001 From: sorket Date: Tue, 11 Jul 2023 23:13:49 -0400 Subject: [PATCH 2/8] tiny change: set FSAA to 4 --- Projects/Client/Common/Source/OgreWidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Projects/Client/Common/Source/OgreWidget.cpp b/Projects/Client/Common/Source/OgreWidget.cpp index f577e7e..b12e861 100644 --- a/Projects/Client/Common/Source/OgreWidget.cpp +++ b/Projects/Client/Common/Source/OgreWidget.cpp @@ -115,6 +115,7 @@ namespace RNR Ogre::NameValuePairList options; options["externalWindowHandle"] = getWindowHandle(); + options["FSAA"] = "4"; #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE options["macAPI"] = "cocoa"; options["macAPICocoaUseNSView"] = "true"; From 676d8589fc6d28e32b9b6ebce832e99330686a7d Mon Sep 17 00:00:00 2001 From: rjindael Date: Tue, 11 Jul 2023 23:43:48 -0700 Subject: [PATCH 3/8] remove nested cmake project decls each project doesn't have to be a PROJECT project per se; i.e. they don't need to be declared as such within CMake. the only project should be RNR --- Projects/Client/Common/CMakeLists.txt | 2 -- Projects/Client/Player/CMakeLists.txt | 2 -- Projects/Client/Server/CMakeLists.txt | 2 -- Projects/Client/Studio/CMakeLists.txt | 2 -- Projects/Engine/CMakeLists.txt | 3 --- 5 files changed, 11 deletions(-) diff --git a/Projects/Client/Common/CMakeLists.txt b/Projects/Client/Common/CMakeLists.txt index bf1d3dc..bfedaf6 100644 --- a/Projects/Client/Common/CMakeLists.txt +++ b/Projects/Client/Common/CMakeLists.txt @@ -1,5 +1,3 @@ -project(Common) - qt_standard_project_setup() qt_add_library(Common STATIC Header/GL/Adorn.hpp diff --git a/Projects/Client/Player/CMakeLists.txt b/Projects/Client/Player/CMakeLists.txt index 6655941..e37bb16 100644 --- a/Projects/Client/Player/CMakeLists.txt +++ b/Projects/Client/Player/CMakeLists.txt @@ -1,5 +1,3 @@ -project(Player) - create_resources(Resource ${CMAKE_BINARY_DIR}/Resources/PlayerResources.hpp) set(CMAKE_AUTOMOC ON) diff --git a/Projects/Client/Server/CMakeLists.txt b/Projects/Client/Server/CMakeLists.txt index 0450c07..abed4f4 100644 --- a/Projects/Client/Server/CMakeLists.txt +++ b/Projects/Client/Server/CMakeLists.txt @@ -1,5 +1,3 @@ -project(Server) - create_resources(Resource ${CMAKE_BINARY_DIR}/Resources/ServerResources.hpp) add_executable(Server diff --git a/Projects/Client/Studio/CMakeLists.txt b/Projects/Client/Studio/CMakeLists.txt index 2f2ddf7..c1bbf3a 100644 --- a/Projects/Client/Studio/CMakeLists.txt +++ b/Projects/Client/Studio/CMakeLists.txt @@ -1,5 +1,3 @@ -project(Studio) - create_resources(Resource ${CMAKE_BINARY_DIR}/Resources/StudioResources.hpp) set(CMAKE_AUTOMOC ON) diff --git a/Projects/Engine/CMakeLists.txt b/Projects/Engine/CMakeLists.txt index 753a466..70059e6 100644 --- a/Projects/Engine/CMakeLists.txt +++ b/Projects/Engine/CMakeLists.txt @@ -1,6 +1,3 @@ -project(Engine) - - add_library(Engine STATIC Header/Helpers/Name.hpp Header/Helpers/Strings.hpp From cdfefa086b06d3b4600449a4bf58efa61bdedb0c Mon Sep 17 00:00:00 2001 From: rjindael Date: Tue, 11 Jul 2023 23:45:01 -0700 Subject: [PATCH 4/8] remove unnecessary linguist tweaks --- .gitattributes | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 27f9a2e..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Ignore GLAD generated API files -glad.* linguist-generated \ No newline at end of file From fa09e930d06a2ddae2714b4b1e3a3c65dcede196 Mon Sep 17 00:00:00 2001 From: rjindael Date: Tue, 11 Jul 2023 23:48:51 -0700 Subject: [PATCH 5/8] remove cglm (use OgreMath) --- CMakeLists.txt | 1 - Projects/Engine/CMakeLists.txt | 2 +- Projects/Engine/Header/Rendering/Adorn.hpp | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2a0c97..84953c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,6 @@ set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/Dependencies) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -Wno-return-type") # Ignore warnings generated by Luau and Qt find_package(Boost REQUIRED) -find_package(cglm REQUIRED CONFIG) find_package(OGRE REQUIRED COMPONENTS Bites CONFIG) add_subdirectory(Projects) \ No newline at end of file diff --git a/Projects/Engine/CMakeLists.txt b/Projects/Engine/CMakeLists.txt index 70059e6..697ccaf 100644 --- a/Projects/Engine/CMakeLists.txt +++ b/Projects/Engine/CMakeLists.txt @@ -29,7 +29,7 @@ add_library(Engine STATIC ) target_include_directories(Engine PUBLIC ${BOOST_INCLUDE_DIRS} Header/) -target_link_libraries(Engine PUBLIC ${BOOST_LIBRARIES} OgreBites cglm Luau.Analysis Luau.Ast Luau.Compiler Luau.VM) +target_link_libraries(Engine PUBLIC ${BOOST_LIBRARIES} OgreBites Luau.Analysis Luau.Ast Luau.Compiler Luau.VM) file(COPY ${OGRE_CONFIG_DIR}/plugins.cfg ${OGRE_CONFIG_DIR}/resources.cfg DESTINATION ${CMAKE_BINARY_DIR}) diff --git a/Projects/Engine/Header/Rendering/Adorn.hpp b/Projects/Engine/Header/Rendering/Adorn.hpp index e83f9ac..071ae97 100644 --- a/Projects/Engine/Header/Rendering/Adorn.hpp +++ b/Projects/Engine/Header/Rendering/Adorn.hpp @@ -2,8 +2,6 @@ #include -#include - #include namespace RNR From 910d0ec4926ace040fb0331ebad41d8db7b80245 Mon Sep 17 00:00:00 2001 From: rjindael Date: Tue, 11 Jul 2023 23:49:27 -0700 Subject: [PATCH 6/8] ignore all log files --- .gitignore | 2 +- Content/RNR/fonts/OgreXMLConverter.log | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 Content/RNR/fonts/OgreXMLConverter.log diff --git a/.gitignore b/.gitignore index 07bac6a..fdb5034 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,4 @@ _deps build Disassembly .vscode -Ogre.log +*.log \ No newline at end of file diff --git a/Content/RNR/fonts/OgreXMLConverter.log b/Content/RNR/fonts/OgreXMLConverter.log deleted file mode 100644 index 26e5c33..0000000 --- a/Content/RNR/fonts/OgreXMLConverter.log +++ /dev/null @@ -1,21 +0,0 @@ -17:36:32: XMLMeshSerializer reading mesh data from /home/caesium/projects/rbxnu/Content/RNR/fonts/Cube.mesh.xml... -17:36:32: Reading geometry... -17:36:32: Geometry done... -17:36:32: Reading submeshes... -17:36:32: Submeshes done. -17:36:32: Reading mesh names... -17:36:32: Mesh names done. -17:36:32: XMLMeshSerializer import successful. -17:36:32: MeshSerializer writing mesh data to stream /home/caesium/projects/rbxnu/Content/RNR/fonts/Cube.mesh... -17:36:32: File header written. -17:36:32: Writing mesh data... -17:36:32: Writing submesh... -17:36:32: Exporting submesh texture aliases... -17:36:32: Submesh texture aliases exported. -17:36:32: Submesh exported. -17:36:32: Exporting bounds information.... -17:36:32: Bounds information exported. -17:36:32: Exporting submesh name table... -17:36:32: Submesh name table exported. -17:36:32: Mesh data exported. -17:36:32: MeshSerializer export successful. From f943c558562df212fc47702b35c618988cef4c81 Mon Sep 17 00:00:00 2001 From: rjindael Date: Tue, 11 Jul 2023 23:51:29 -0700 Subject: [PATCH 7/8] linguist: ignore Ogre files (+ nit) --- .gitattributes | 1 + Projects/Client/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..c7459c5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +Content/Ogre/** linguist-vendored \ No newline at end of file diff --git a/Projects/Client/CMakeLists.txt b/Projects/Client/CMakeLists.txt index 289168d..d637df9 100644 --- a/Projects/Client/CMakeLists.txt +++ b/Projects/Client/CMakeLists.txt @@ -5,8 +5,10 @@ if(COMPILE_PLAYER OR COMPILE_STUDIO) if(LINUX) include(/usr/share/cmake/Modules/FindX11.cmake) endif() + find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets OpenGLWidgets) set(QT6_LIBRARIES_INCL Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets Qt6::GuiPrivate ${X11_X11_LIB}) + add_subdirectory(Common) if(COMPILE_PLAYER) From b6fb19bc9df41e5541f3466dea8a15354b6f62e8 Mon Sep 17 00:00:00 2001 From: rjindael Date: Wed, 12 Jul 2023 00:49:52 -0700 Subject: [PATCH 8/8] Embed Win32 resources (and rewrite resources entirely) --- CMake/CreateResources.cmake | 2 +- Projects/Client/Common/CMakeLists.txt | 22 ++++---- Projects/Client/Player/CMakeLists.txt | 20 +++---- Projects/Client/Player/Header/MainWindow.hpp | 2 + .../Client/Player/Resource/Windows/Icon.ico | Bin 0 -> 4286 bytes .../Player/Resource/Windows/Information.h | 22 ++++++++ .../Client/Player/Resource/Windows/Script.rc | 49 ++++++++++++++++++ Projects/Client/Player/Source/MainWindow.cpp | 2 - Projects/Client/Server/CMakeLists.txt | 18 +++---- .../Client/Server/Resource/Windows/Icon.ico | Bin 0 -> 4286 bytes .../Server/Resource/Windows/Information.h | 22 ++++++++ .../Client/Server/Resource/Windows/Script.rc | 49 ++++++++++++++++++ Projects/Client/Studio/CMakeLists.txt | 20 +++---- Projects/Client/Studio/Header/MainWindow.hpp | 6 +++ .../Client/Studio/Resource/Windows/Icon.ico | Bin 0 -> 4286 bytes .../Studio/Resource/Windows/Information.h | 22 ++++++++ .../Client/Studio/Resource/Windows/Script.rc | 49 ++++++++++++++++++ Projects/Client/Studio/Source/MainWindow.cpp | 7 --- 18 files changed, 261 insertions(+), 51 deletions(-) create mode 100644 Projects/Client/Player/Resource/Windows/Icon.ico create mode 100644 Projects/Client/Player/Resource/Windows/Information.h create mode 100644 Projects/Client/Player/Resource/Windows/Script.rc create mode 100644 Projects/Client/Server/Resource/Windows/Icon.ico create mode 100644 Projects/Client/Server/Resource/Windows/Information.h create mode 100644 Projects/Client/Server/Resource/Windows/Script.rc create mode 100644 Projects/Client/Studio/Resource/Windows/Icon.ico create mode 100644 Projects/Client/Studio/Resource/Windows/Information.h create mode 100644 Projects/Client/Studio/Resource/Windows/Script.rc diff --git a/CMake/CreateResources.cmake b/CMake/CreateResources.cmake index 96f27f6..e4419d7 100644 --- a/CMake/CreateResources.cmake +++ b/CMake/CreateResources.cmake @@ -1,6 +1,6 @@ function(create_resources directory output) file(WRITE ${output} "#include \n\n") - file(GLOB bins ${directory}/*) + file(GLOB bins "${directory}/*.png") # Add other file types if necessary foreach(bin ${bins}) string(REGEX MATCH "([^/]+)$" filename ${bin}) diff --git a/Projects/Client/Common/CMakeLists.txt b/Projects/Client/Common/CMakeLists.txt index bfedaf6..6bdd7d1 100644 --- a/Projects/Client/Common/CMakeLists.txt +++ b/Projects/Client/Common/CMakeLists.txt @@ -1,20 +1,16 @@ -qt_standard_project_setup() -qt_add_library(Common STATIC - Header/GL/Adorn.hpp - Header/GL/RenderContext.hpp - Header/OgreWidget.hpp - +list(APPEND SOURCE Source/GL/Adorn.cpp Source/OgreWidget.cpp ) -if(WIN32) - add_custom_command(TARGET Common POST_BUILD - COMMAND ${TOOL_WINDEPLOYQT} - $ - COMMENT "Running windeployqt..." - ) -endif() +list(APPEND HEADER + Header/GL/Adorn.hpp + Header/GL/RenderContext.hpp + Header/OgreWidget.hpp +) + +qt_standard_project_setup() +qt_add_library(Common STATIC ${SOURCE} ${HEADER}) target_include_directories(Common PUBLIC Header) target_link_libraries(Common PUBLIC ${QT6_LIBRARIES_INCL} Engine) \ No newline at end of file diff --git a/Projects/Client/Player/CMakeLists.txt b/Projects/Client/Player/CMakeLists.txt index e37bb16..798c405 100644 --- a/Projects/Client/Player/CMakeLists.txt +++ b/Projects/Client/Player/CMakeLists.txt @@ -1,21 +1,23 @@ -create_resources(Resource ${CMAKE_BINARY_DIR}/Resources/PlayerResources.hpp) +create_resources(Resource ${CMAKE_BINARY_DIR}/Resource/Player.hpp) set(CMAKE_AUTOMOC ON) -qt_add_executable(Player - ${CMAKE_BINARY_DIR}/Resources/PlayerResources.hpp - - Header/MainWindow.hpp - +list(APPEND SOURCE Source/main.cpp Source/MainWindow.cpp ) -add_custom_command(TARGET Player POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy -t $ $ - COMMAND_EXPAND_LISTS +list(APPEND HEADER + ${CMAKE_BINARY_DIR}/Resource/Player.hpp + Header/MainWindow.hpp ) +if(WIN32) + list(APPEND HEADER Resource/Windows/Script.rc) +endif() + +qt_add_executable(Player ${SOURCE} ${HEADER}) + target_include_directories(Player PRIVATE Header) target_link_libraries(Player PRIVATE Common Engine) diff --git a/Projects/Client/Player/Header/MainWindow.hpp b/Projects/Client/Player/Header/MainWindow.hpp index aec09ff..d309363 100644 --- a/Projects/Client/Player/Header/MainWindow.hpp +++ b/Projects/Client/Player/Header/MainWindow.hpp @@ -2,6 +2,8 @@ #include +#include "Resource/Player.hpp" + class MainWindow : public QMainWindow { Q_OBJECT diff --git a/Projects/Client/Player/Resource/Windows/Icon.ico b/Projects/Client/Player/Resource/Windows/Icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..edf7d61ce342bcef6d880de27b41f2ca550940ee GIT binary patch literal 4286 zcmbW*d63R^9KiA4V^`#kQDerjlWnMGR3k@8YBH0eq|r=es&O<^jv6`3lq=M(h;|cY z#mczakR@_Fixpi;B*(Jr>Qw&phw=1&Kl}Td4P&C_wZG%}J>Spq{rsM0ilPMnW@SbG zjTSeEqU)n5Y7K5h_rd$=fB5XW+LbDAT;1OeQ7Ven#*RIa7 zGag13>Y@XB#K(FZ&Er~xoIEy-@1=9TR3ttR^|)qZWXAW5={@Ugh8K{Fi5P-mn1yjL zuh!^|XV50*^*u0`ON9@yjoA);a6js!6}rXO*&O{W4{Nan>#!P2@gB@+LVTUiaUfno zFIdOr;#;e|{1C?IjxMmq;pmEv7>#W>fc@Bk?bwQWcopXJHC7-8FQN%9itoKx3yuTe zcaoTck+9zjU>?uI^}dAhkKz~XhVjg+0EO`W5!k0G$j15jo>x(g^Y$=?{Vc~J6k`cC z;8T1K*DHZFAI7gJ!!DTD7g!Jb;TrOOPo(2}j9tU=X0(N~(;r1}y}w}|-^04>^GPo8aXq@?`bJ9rs4 z!MIg53)fhN$>@nTs0-t(8hXI>?ZIJeK|W@|b&PL}Vi@-%PQdwC2k-kH zZbuTXWlZ}x70$|hjKc${fvW%gtH-soXa9{KYIfbFaJ>!q7_Q}hI13dB^R|<7pR*tN zn1pV)1$|&YC&GK__#CZ26WMqYe$RI})aSdk9IIeV`}sO@@EP{PXRO=!_R1XlVgQDq z6^zjW?a&+v7+dBy7ygFkq7e4rIIJ)9-Wc|N2?pai%!Yeq+)XIPG;~5|jK@IS0Am@q zT6`Yj-^%qeI6o!uopP@a!ales=C&U8z?v7M4|*UU#&>__V>qm-7TTg8%qIisJr94p zMosuk64q)Q`@I9s*FKn+Iht3vXP#Zr0eP_htKsj7bMCs<+6awd?ICp4*)xYG7zO)h zt=nL~-COIm2b-}5-am*fcmwTl7bc?s=HmW%-}wKDdEteh$69in3Tv>B&etB4!M@uM zW3ELh>`4wDLVaZ835>wwXpW0&zA(PmJSTIt4(H1mbbn{Snv-z8j9G+S_}Lgdh}v+C zhOiEg|0{OLhv)r%CLV*o|9xQ%&au5+gqau$-zjHH=j-I$HPXVmS8|NM>u;kyZ4ZAZ zti$=}j$UXD^E8e#9nP;L)Fq#d*9_}c=Q`cP_`Y%K!24HSW7WW^bNy4Pvr)#mtSE7o z|5Xs2;k=v&la(^YMNt~p3C) + #include + #else + #include + #include + #endif +#else + // MSVC, Windows SDK + #include +#endif + +IDI_ICON1 ICON APP_ICON + +LANGUAGE PRODUCT_LANGUAGE, SUBLANG_DEFAULT + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_RESOURCE + PRODUCTVERSION VERSION_RESOURCE + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", APP_ORGANIZATION + VALUE "FileDescription", APP_DESCRIPTION + VALUE "FileVersion", VERSION_RESOURCE_STR + VALUE "LegalCopyright", APP_COPYRIGHT + VALUE "ProductName", APP_NAME + VALUE "ProductVersion", VERSION_RESOURCE_STR + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", PRODUCT_LANGUAGE, PRODUCT_CHARSET + END +END \ No newline at end of file diff --git a/Projects/Client/Player/Source/MainWindow.cpp b/Projects/Client/Player/Source/MainWindow.cpp index 6d84c9e..744d25e 100644 --- a/Projects/Client/Player/Source/MainWindow.cpp +++ b/Projects/Client/Player/Source/MainWindow.cpp @@ -1,7 +1,5 @@ #include -#include "Resources/PlayerResources.hpp" - MainWindow::MainWindow() { QPixmap pixmap = QPixmap(); diff --git a/Projects/Client/Server/CMakeLists.txt b/Projects/Client/Server/CMakeLists.txt index abed4f4..9b42ddc 100644 --- a/Projects/Client/Server/CMakeLists.txt +++ b/Projects/Client/Server/CMakeLists.txt @@ -1,15 +1,13 @@ -create_resources(Resource ${CMAKE_BINARY_DIR}/Resources/ServerResources.hpp) +create_resources(Resource ${CMAKE_BINARY_DIR}/Resource/Server.hpp) -add_executable(Server - ${CMAKE_BINARY_DIR}/Resources/ServerResources.hpp - - Source/main.cpp -) +list(APPEND SOURCE Source/main.cpp) +list(APPEND HEADER ${CMAKE_BINARY_DIR}/Resource/Server.hpp) -add_custom_command(TARGET Server POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy -t $ $ - COMMAND_EXPAND_LISTS -) +if(WIN32) + list(APPEND HEADER Resource/Windows/Script.rc) +endif() + +add_executable(Server ${SOURCE} ${HEADER}) target_include_directories(Server PRIVATE Header) target_link_libraries(Server PRIVATE Engine) \ No newline at end of file diff --git a/Projects/Client/Server/Resource/Windows/Icon.ico b/Projects/Client/Server/Resource/Windows/Icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c6e9215e06428054bca2ed23ecfd55cf1f5e8513 GIT binary patch literal 4286 zcmbW*dyr0L9KiAO?yksXiP;)6E<4$VYDP73DQ#*plcJ>2OfuCh+e|HL{Ip;a&eSVkcIj!8zL5sU0Z}Je=D53 z9>;7vicB;?SM&*w=^V}DdPF&SY!!|rbFM2A_oI58GXrVim@yr*&enJlg~-P+jKCaB zfO&O5e>{thA+PU)xzzb_9LDU7fp`#2(H_0R>nx7mn~jYq$0n@93cL?TZ z=m+bl^W!+I)n0xCWAsK3SmQ|aL^q5@1rFgLc3~&BV0-il6e?+iu>obMl)#}BYB`@9?9 z!CIZ)x_zb!#&^tTv;*J5T+H3xCiehGkiC-d)fZXhdK5{KAis)&f<3*hV$BgYcjUI*aqu9 z1bh7>yyrf0@7#-eh~j#5z5Bx)Ps0A$EAuhFz4!puX8o>(x%>q4azFUIIeibu?7#7S z#(iQvZ{cy&?t2v9Ub|N+@h8l|-nte&Fajm8p40F-`)j?%cRgGe?SNzMk*{I=d3YDE z;1(FSw$@y~18e*P=5PYeH3`qa`>vsDYJTQmK0f1`*#qAJ_o3^!5NlwLpJFPE@9&y> zJ&K>od1GY5yshtFn1|=?FZazL%!1Dxf@^gg_T0RDZa>V+T$Z31YcT_PcnqyzOyir! z{TKlEfa`PwuCw!-Lp3Te9hdr%ACG4I3wO?Ct5YABs=X5Wa zhv#cx4(4JH%+davk9BW^bF9P^^hHNBf$^1sK5%|}a17-r!W=k{@r|(_#yyQwaDQxq z_jvdu0(O;33pU?SKE$xpwc_f8$3rJMRiO-xhoV=W;#V3ss2r+iuQ% z&VCeOGJ4@Q421p6hhxe39IZbMS$GZ>bL@xDShw-*l{w}h z7sJpV#%PPqXoDDxE%TcXe?tpV40~`A)))2O81{ZShT?h5g==NpZCH=#=#FemL>_K} zv5cD%o=5R-=XxdFKV|Tpa;*=;KDZ|4wi))onwMc9`k)BLcYPLNB&?|+I$;pZCl!}` zyha1~OdQr~9Q(Zs?ymzdFLN}nXv{o&qAO;@{;z|-C+>6SwbmBMfVE%p@jBF!;~3aK zYpsC&c5SWK9+YAO96yY5yot`Z2UD;B=HmJ|Zu~2LydP@EaT=__KDxj5;VA68{V?W6 z?0`Kfz$0jiEIfr#coJ=JSx=-tVX33HbY;18Z;}+uNm>h2ij>a&M`oPR^YpDVq0cj^TIxZM3Id;O~TW zxIcQMA3DH1jpLq<&aWm^ozI4IM)TI=I@!Z;+&GQl_%+v9J80-#>Q7BHA|cg+9uA$dL+&h`agX* BlZpTU literal 0 HcmV?d00001 diff --git a/Projects/Client/Server/Resource/Windows/Information.h b/Projects/Client/Server/Resource/Windows/Information.h new file mode 100644 index 0000000..420e92d --- /dev/null +++ b/Projects/Client/Server/Resource/Windows/Information.h @@ -0,0 +1,22 @@ +#pragma once + +#define VERSION_MAJOR_MINOR_STR "1.0" +#define VERSION_MAJOR_MINOR_PATCH_STR "1.0.0" +#define VERSION_FULL_STR "1.0.0.0" +#define VERSION_RESOURCE 1, 0, 0, 0 +#define VERSION_RESOURCE_STR VERSION_FULL_STR "\0" + +/* + * These properties are part of VarFileInfo. + * PRODUCT_LANGUAGE is also the resource file's recognizer (but still shares the same value.) + * For more information, please see: https://learn.microsoft.com/en-us/windows/win32/menurc/varfileinfo-block + */ +#define PRODUCT_LANGUAGE 0x0409 // en-US +#define PRODUCT_CHARSET 1200 // Unicode + +#define APP_ICON "Icon.ico" + +#define APP_NAME "RNR Server\0" +#define APP_DESCRIPTION "RNR's Not Roblox\0" +#define APP_ORGANIZATION "Legacy Roblox Reverse Engineers\0" +#define APP_COPYRIGHT "This program is licensed under the GNU General Public License v3.0.\0" \ No newline at end of file diff --git a/Projects/Client/Server/Resource/Windows/Script.rc b/Projects/Client/Server/Resource/Windows/Script.rc new file mode 100644 index 0000000..dd45a93 --- /dev/null +++ b/Projects/Client/Server/Resource/Windows/Script.rc @@ -0,0 +1,49 @@ +#include "Information.h" + +#if defined(__MINGW64__) || defined(__MINGW32__) + // MinGW-w64, MinGW + #if defined(__has_include) && __has_include() + #include + #else + #include + #include + #endif +#else + // MSVC, Windows SDK + #include +#endif + +IDI_ICON1 ICON APP_ICON + +LANGUAGE PRODUCT_LANGUAGE, SUBLANG_DEFAULT + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_RESOURCE + PRODUCTVERSION VERSION_RESOURCE + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", APP_ORGANIZATION + VALUE "FileDescription", APP_DESCRIPTION + VALUE "FileVersion", VERSION_RESOURCE_STR + VALUE "LegalCopyright", APP_COPYRIGHT + VALUE "ProductName", APP_NAME + VALUE "ProductVersion", VERSION_RESOURCE_STR + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", PRODUCT_LANGUAGE, PRODUCT_CHARSET + END +END \ No newline at end of file diff --git a/Projects/Client/Studio/CMakeLists.txt b/Projects/Client/Studio/CMakeLists.txt index c1bbf3a..28d66de 100644 --- a/Projects/Client/Studio/CMakeLists.txt +++ b/Projects/Client/Studio/CMakeLists.txt @@ -1,21 +1,23 @@ -create_resources(Resource ${CMAKE_BINARY_DIR}/Resources/StudioResources.hpp) +create_resources(Resource ${CMAKE_BINARY_DIR}/Resource/Studio.hpp) set(CMAKE_AUTOMOC ON) -qt_add_executable(Studio - ${CMAKE_BINARY_DIR}/Resources/StudioResources.hpp - - Header/MainWindow.hpp - +list(APPEND SOURCE Source/main.cpp Source/MainWindow.cpp ) -add_custom_command(TARGET Studio POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy -t $ $ - COMMAND_EXPAND_LISTS +list(APPEND HEADER + ${CMAKE_BINARY_DIR}/Resource/Studio.hpp + Header/MainWindow.hpp ) +if(WIN32) + list(APPEND HEADER Resource/Windows/Script.rc) +endif() + +qt_add_executable(Studio ${SOURCE} ${HEADER}) + target_include_directories(Studio PRIVATE Header) target_link_libraries(Studio PRIVATE Common Engine) diff --git a/Projects/Client/Studio/Header/MainWindow.hpp b/Projects/Client/Studio/Header/MainWindow.hpp index 7b42c0e..e118989 100644 --- a/Projects/Client/Studio/Header/MainWindow.hpp +++ b/Projects/Client/Studio/Header/MainWindow.hpp @@ -7,9 +7,15 @@ #include #include #include +#include +#include +#include +#include #include +#include "Resource/Studio.hpp" + class MainWindow : public QMainWindow { Q_OBJECT diff --git a/Projects/Client/Studio/Resource/Windows/Icon.ico b/Projects/Client/Studio/Resource/Windows/Icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..317aed1bc00414e41ed49d8c74e48f4e3ff874e7 GIT binary patch literal 4286 zcmbW*X>1i$7=Yoqv%iThDK&e;yh;g~TUv(Aoq5&6i)NQ}mO zOon-7U?84F*O1ru!dx2sI1XcW#~?g_6r`hXc%8=4d-Jdf<=Bk%D8~CRr>Ws}0mmG? zi~+EY20xC&TJ7aWFh)OQ!5YV)4|-t&cH%G&VK;VR2bSP9n9ny@gFL*1_PFfhSg13{ zVemU~EW|k2@1-!07vOwf!T2ZeEB3*7=Cv3_aQryz(+s4c?&EnqjX3WCW7y9s9K{B# z#8!NUFW`J-u;yd<4VBmn^ZF87U_YEgj`v66<1us{$6L@1?wz41f%E+X^Y{VQWuN!p zJ6NmpTer_t!}yN*j4JRg%*EX8ZDJ2_G=4Jf!f?C}_lSFK8mzAdXJCEyGKyWwx%cBR zFY`NyU+^>b!~C|vUQR%7+=*r|wrqEBA8EnS zXWS>&^A;XM{k})>?X`QQ3V*^J?5%5&h0!R1^_+&!*N;8ApdF^z8? z_u*-{2VAG4aGjms9BQx=lkh5>vlKpOeD~o-?124n|GO8WwV%cLI1EECBx3vWbKVNW zF$b>kDA+H1FLQ7${(@_n2j^QIUfXZuSbH3Im%-m_ zbFqdRM0@HC=e~FLbum7~Qn<&eu`fJ#Pws`enuj^~yJ?KK;oQ%m4UF$zd=IXhmct&q zU!pNe6k#InfbrYGc>Z=+uQ@yKSeT3RS(|m+ z6MOJCjNyCrG1kERTrZ#Xp2sL3=Prc%$2Ay?E--!!>9D8OsDiz-zxHbz4#7Ff;GFIS z^YDBv%)wmjfjQcL^ReztaE?`&j{fM1mN32=Asfzb500T61(*-#F}^W2z__Pz3hs~1 zaNPHB7vgX(W7@}=aIX|%G9E+|)c^Od71!=P`)~ZHX6G%2^KHc^a4y%wy-_k4$=`h2%mV;ziXKi@zeKF0z0jCC8|UYX-y z48usI!x){>9i0$^v1NXX;BRO?ieL{;!uq1#8^hkO#0Wf(1#qp5yB!-a3%!wvDagT% zFqUx}h38TH+qhl@_fHvor(EkJun(?@xov?xu;vvQglrVR_^wYO#=x4Ip&N$4e3Ed< z$7?i&&%|M^#d4|-xA?EiZBd*VKKUTbZOcChwKK3<2~a~u!* zXRSM7zg=7FwFjlx2*;109B-mK?#6U1hPk*tjvN1qAMb~{aGVKiu#fJq{iuX}w;#sb zgbLV`JUomPq~S@7#S`d+%W7^Y8J;r-bF~ilmwV9lodaujZQNhREI~fJHxUn^Ih>;n zti$8~iXG*{^L{@WkHg>p!LSDRvAtc6xfliCDfgD@>g3!x5~6vp<`{n0-$r}d1O84} zhx?-+1|S3GX&m=-bbd9V8hkdKGn%(C*NGm6$%zycZ9j;k+$U#Mq>&gx0lZ`58PH%c?z3=>Gs& CJ*_nW literal 0 HcmV?d00001 diff --git a/Projects/Client/Studio/Resource/Windows/Information.h b/Projects/Client/Studio/Resource/Windows/Information.h new file mode 100644 index 0000000..5c1eaa7 --- /dev/null +++ b/Projects/Client/Studio/Resource/Windows/Information.h @@ -0,0 +1,22 @@ +#pragma once + +#define VERSION_MAJOR_MINOR_STR "1.0" +#define VERSION_MAJOR_MINOR_PATCH_STR "1.0.0" +#define VERSION_FULL_STR "1.0.0.0" +#define VERSION_RESOURCE 1, 0, 0, 0 +#define VERSION_RESOURCE_STR VERSION_FULL_STR "\0" + +/* + * These properties are part of VarFileInfo. + * PRODUCT_LANGUAGE is also the resource file's recognizer (but still shares the same value.) + * For more information, please see: https://learn.microsoft.com/en-us/windows/win32/menurc/varfileinfo-block + */ +#define PRODUCT_LANGUAGE 0x0409 // en-US +#define PRODUCT_CHARSET 1200 // Unicode + +#define APP_ICON "Icon.ico" + +#define APP_NAME "RNR Studio\0" +#define APP_DESCRIPTION "RNR's Not Roblox\0" +#define APP_ORGANIZATION "Legacy Roblox Reverse Engineers\0" +#define APP_COPYRIGHT "This program is licensed under the GNU General Public License v3.0.\0" \ No newline at end of file diff --git a/Projects/Client/Studio/Resource/Windows/Script.rc b/Projects/Client/Studio/Resource/Windows/Script.rc new file mode 100644 index 0000000..dd45a93 --- /dev/null +++ b/Projects/Client/Studio/Resource/Windows/Script.rc @@ -0,0 +1,49 @@ +#include "Information.h" + +#if defined(__MINGW64__) || defined(__MINGW32__) + // MinGW-w64, MinGW + #if defined(__has_include) && __has_include() + #include + #else + #include + #include + #endif +#else + // MSVC, Windows SDK + #include +#endif + +IDI_ICON1 ICON APP_ICON + +LANGUAGE PRODUCT_LANGUAGE, SUBLANG_DEFAULT + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_RESOURCE + PRODUCTVERSION VERSION_RESOURCE + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", APP_ORGANIZATION + VALUE "FileDescription", APP_DESCRIPTION + VALUE "FileVersion", VERSION_RESOURCE_STR + VALUE "LegalCopyright", APP_COPYRIGHT + VALUE "ProductName", APP_NAME + VALUE "ProductVersion", VERSION_RESOURCE_STR + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", PRODUCT_LANGUAGE, PRODUCT_CHARSET + END +END \ No newline at end of file diff --git a/Projects/Client/Studio/Source/MainWindow.cpp b/Projects/Client/Studio/Source/MainWindow.cpp index a5cadd6..06d6920 100644 --- a/Projects/Client/Studio/Source/MainWindow.cpp +++ b/Projects/Client/Studio/Source/MainWindow.cpp @@ -1,11 +1,4 @@ #include -#include -#include -#include -#include - - -#include "Resources/StudioResources.hpp" MainWindow::MainWindow() {