cleanup

Author: mikkokko

CMakeLists.txt

@@ -2,29 +2,14 @@ cmake_minimum_required(VERSION 3.15)
 
 set(CMAKE_CXX_STANDARD 17)
 
-project(gc_proxy)
+project(cs2_patch)
 
-
-# should be bin dir on windows, doesn't matter on linux or macos
-set(PROXY_DIR CACHE STRING "Directory to output executable to")
-
-# only relevant on windows, on linux and macos we build libgc_proxy.so/dylib
-# and load it with LD_PRELOAD/DYLD_INSERT_LIBRARIES
-set(PROXY_NAME CACHE STRING "Exectable name (csgo, hl2...)")
+set(OUT_DIR CACHE STRING "Directory to output executable to")
 
 set(SRC_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 if (MSVC)
-	# urgh
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:mainCRTStartup")
-
-	add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
-	
-	# don't crash on machines with a lot of ram
-	add_link_options(/LARGEADDRESSAWARE)
-	
-	# newer csgo builds use several gigabytes of stack
-	add_link_options(/STACK:1572864)
 endif()
 
-add_subdirectory(proxy)
+add_subdirectory(launcher)

external/protobuf/lib/libprotobuf.lib

@@ -0,0 +1,45 @@
+set(LAUNCHER_SRC steam_proxy.cpp)
+
+if (WIN32)
+	set(LAUNCHER_SRC ${LAUNCHER_SRC} launcher_win.cpp plat_win.cpp launcher.rc)
+else()
+	set(LAUNCHER_SRC ${LAUNCHER_SRC} plat_unix.cpp)
+endif()
+
+set(PROTO_SRC
+	${SRC_DIR}/protos/gcsdk_gcmessages.pb.cc
+	${SRC_DIR}/protos/steammessages.pb.cc)
+
+source_group("Protobufs" FILES ${PROTO_SRC})
+set(LAUNCHER_SRC ${LAUNCHER_SRC} ${PROTO_SRC})
+
+include_directories(${SRC_DIR}/protos)
+
+# local protobuf for msvc
+if(MSVC)
+	include_directories(${SRC_DIR}/external/protobuf/src)
+	link_directories(${SRC_DIR}/external/protobuf/lib64)
+
+	link_libraries(
+		$<$<CONFIG:Debug>:libprotobufd>
+		$<$<CONFIG:RelWithDebInfo>:libprotobuf>
+		$<$<CONFIG:Release>:libprotobuf>
+		$<$<CONFIG:MinSizeRel>:libprotobuf>)
+else()
+	link_libraries(protobuf)
+endif()
+
+include_directories(${SRC_DIR}/shared ${SRC_DIR}/external/steam)
+add_compile_definitions(STEAM_API_NODLL)
+
+add_executable(cs2 WIN32 ${LAUNCHER_SRC})
+
+# for protobuf
+set_property(TARGET cs2 PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
+if (OUT_DIR)
+	add_custom_command(TARGET cs2 POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E copy
+		$<TARGET_FILE:cs2>
+		${OUT_DIR}/$<TARGET_FILE_NAME:cs2>)
+endif()

external/protobuf/lib/libprotobufd.lib

@@ -1,4 +1,6 @@
-#include "precompiled.h"
+#include "platform.h"
+
+#include <cstdio>
 #include <windows.h>
 
 typedef void (*ConColorMsg_t)(const MsgColor &color, const char *fmt, ...);
@@ -42,16 +44,6 @@ void HardError(const char *fmt, ...)
 	ExitProcess(1);
 }
 
-void *FindSymbol(void *handle, const char *symbol)
-{
-	return (void *)GetProcAddress((HMODULE)handle, symbol);
-}
-
-void *GetModule(const char *name)
-{
-	return (void *)GetModuleHandleA(name);
-}
-
 bool IsAddrFromModule(void *addr, const char *name)
 {
 	HMODULE hModule;

external/protobuf/lib/libprotobufd.pdb

@@ -2,15 +2,7 @@
 
 struct MsgColor
 {
-	MsgColor(int _r, int _g, int _b, int _a) :
-		r(_r),
-		g(_g),
-		b(_b),
-		a(_a)
-	{
-	}
-
-	uint8 r, g, b, a;
+	unsigned char r, g, b, a;
 };
 
 void InitLog();
@@ -20,28 +12,18 @@ void DebugLogColor(bool bError, MsgColor color, const char *fmt, ...);
 template <typename... Args>
 inline void DebugLog(const char *fmt, Args... args)
 {
-	DebugLogColor(false, MsgColor(0, 200, 255, 255), fmt, args...);
+	DebugLogColor(false, { 0, 200, 255, 255 }, fmt, args...);
 }
 
 template <typename... Args>
 inline void DebugError(const char *fmt, Args... args)
 {
-	DebugLogColor(true, MsgColor(255, 0, 0, 255), fmt, args...);
+	DebugLogColor(true, { 255, 0, 0, 255 }, fmt, args...);
 }
 
 // mainly for steam stuff
 void HardError(const char *fmt, ...);
 
-void *FindSymbol(void *handle, const char *symbol);
-
-template<typename T>
-void FindSymbol(T *dst, void *handle, const char *symbol)
-{
-	*dst = (T)FindSymbol(handle, symbol);
-}
-
-void *GetModule(const char *name);
-
 bool IsAddrFromModule(void *addr, const char *name);
 
 #if defined(_WIN32)