summaryrefslogtreecommitdiffhomepage
path: root/StarsEx
diff options
context:
space:
mode:
Diffstat (limited to 'StarsEx')
-rw-r--r--StarsEx/CMakeLists.txt11
-rw-r--r--StarsEx/Main.cpp150
-rw-r--r--StarsEx/Stars.icobin2998 -> 0 bytes
-rw-r--r--StarsEx/Stars.rc.conf39
-rw-r--r--StarsEx/resource.h6
5 files changed, 2 insertions, 204 deletions
diff --git a/StarsEx/CMakeLists.txt b/StarsEx/CMakeLists.txt
index 6961ad4..b66eb85 100644
--- a/StarsEx/CMakeLists.txt
+++ b/StarsEx/CMakeLists.txt
@@ -1,8 +1,7 @@
project(StarsEx)
include(GitDescribe)
-include(GitToResource)
-add_executable(
- StarsEx WIN32
+add_library(
+ StarsEx STATIC
ActiveWindow.cpp
Archive.cpp
Asteroid.cpp
@@ -126,7 +125,6 @@ add_executable(
Locale_ss.cpp
MCIWave.cpp
MachineInfo.cpp
- Main.cpp
MapView.cpp
Menu.cpp
MenuDlg.cpp
@@ -301,15 +299,11 @@ target_compile_definitions(
PRIVATE _ALLOW_KEYWORD_MACROS
)
git_describe(VERSION)
-git_to_resource(RC_VERSION ${VERSION})
-configure_file(Stars.rc.conf ${CMAKE_CURRENT_BINARY_DIR}/Stars.rc @ONLY)
configure_file(VersionInfo.cpp.conf ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.cpp @ONLY)
target_sources(
StarsEx
- PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/Stars.rc
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.cpp
)
-set_target_properties(StarsEx PROPERTIES OUTPUT_NAME Starshatter)
if(MSVC)
target_include_directories(
StarsEx
@@ -345,4 +339,3 @@ else()
PUBLIC -l:libdxguid.a
)
endif()
-install(TARGETS StarsEx RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/StarsEx/Main.cpp b/StarsEx/Main.cpp
deleted file mode 100644
index a71476d..0000000
--- a/StarsEx/Main.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Starshatter: The Open Source Project
- Copyright (c) 2021-2022, Starshatter: The Open Source Project Contributors
- Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors
- Copyright (c) 1997-2006, Destroyer Studios LLC.
-
- AUTHOR: John DiCamillo
-*/
-
-
-#include "Starshatter.h"
-#include "StarServer.h"
-#include "HUDView.h"
-#include "Utils.h"
-
-#include "NetHost.h"
-#include "NetAddr.h"
-#include "NetLayer.h"
-#include "NetBrokerClient.h"
-#include "NetClient.h"
-#include "HttpClient.h"
-
-#include "Color.h"
-#include "DataLoader.h"
-#include "Pcx.h"
-#include "MachineInfo.h"
-#include "Encrypt.h"
-#include "FormatUtil.h"
-#include "Panic.h"
-#include "ParseUtil.h"
-#include "Random.h"
-#include "VersionInfo.h"
-
-// +--------------------------------------------------------------------+
-// WinMain
-// +--------------------------------------------------------------------+
-
-extern int VD3D_describe_things;
-int dump_missions = 0;
-
-static void PrintLogHeader()
-{
- Text sTime = FormatTimeString();
-
- Print("+====================================================================+\n");
- Print("| STARSHATTER %-25s%29s |\n", versionInfo, sTime.data());
-
- MachineInfo::DescribeMachine();
-}
-
-int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
- LPSTR lpCmdLine, int nCmdShow)
-{
- int result = 0;
- int test_mode = 0;
- int do_server = 0;
-
- if (strstr(lpCmdLine, "-server"))
- AssignErrLog(fopen("serverlog.txt", "wb"));
- else
- AssignErrLog(fopen("errlog.txt", "wb"));
-
- PrintLogHeader();
-
- if (strstr(lpCmdLine, "-test")) {
- Print(" Request TEST mode\n");
- test_mode = 1;
- }
-
- if (strstr(lpCmdLine, "-fps")) {
- HUDView::ShowFPS(true);
- }
-
- if (strstr(lpCmdLine, "-dump")) {
- Print(" Request dump dynamic missions\n");
- dump_missions = 1;
- }
-
- if (strstr(lpCmdLine, "-lan")) {
- Print(" Request LAN ONLY mode\n");
- NetBrokerClient::Disable();
- }
-
- if (strstr(lpCmdLine, "-server")) {
- do_server = 1;
- Print(" Request Standalone Server Mode\n");
- }
-
- char* d3dinfo = strstr(lpCmdLine, "-d3d");
- if (d3dinfo) {
- int n = d3dinfo[4] - '0';
-
- if (n >= 0 && n <= 5)
- VD3D_describe_things = n;
-
- Print(" D3D Info Level: %d\n", VD3D_describe_things);
- }
- else {
- VD3D_describe_things = 0;
- }
-
- try {
- NetLayer net;
-
- if (do_server) {
- StarServer* server = new StarServer();
-
- if (server->Init(hInstance, hPrevInstance, lpCmdLine, nCmdShow))
- result = server->Run();
-
- Print("\n+====================================================================+\n");
- Print(" Begin Shutdown...\n");
-
- delete server;
- }
-
- else {
- Starshatter* stars = 0;
-
- stars = new Starshatter;
- stars->SetTestMode(test_mode);
-
- if (stars->Init(hInstance, hPrevInstance, lpCmdLine, nCmdShow))
- result = stars->Run();
-
- Print("\n+====================================================================+\n");
- Print(" Begin Shutdown...\n");
-
- delete stars;
- }
-
- Token::close();
-
- if (Panic::Panicked())
- MessageBox(0, Panic::Message(), "Starshatter - Error", MB_OK);
- }
-
- catch (const char* msg) {
- Print(" FATAL EXCEPTION: '%s'\n", msg);
- }
- /* } */
-
- Print("+====================================================================+\n");
- Print(" END OF LINE.\n");
-
- CloseErrLog();
-
- return result;
-}
-
-
diff --git a/StarsEx/Stars.ico b/StarsEx/Stars.ico
deleted file mode 100644
index 69980ca..0000000
--- a/StarsEx/Stars.ico
+++ /dev/null
Binary files differ
diff --git a/StarsEx/Stars.rc.conf b/StarsEx/Stars.rc.conf
deleted file mode 100644
index 45479d3..0000000
--- a/StarsEx/Stars.rc.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <winres.h>
-
-#include "resource.h"
-
-Stars ICON DISCARDABLE "Stars.ico"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION @RC_VERSION@
- PRODUCTVERSION @RC_VERSION@
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "Comments", "A military space combat simulator\0"
- VALUE "CompanyName", "Starshatter: The Open Source Project Contributors\0"
- VALUE "FileDescription", "Stars\0"
- VALUE "FileVersion", "@VERSION@\0"
- VALUE "InternalName", "Stars45\0"
- VALUE "LegalCopyright", "Copyright (c) 2022, Starshatter: The Open Source Project Contributors\0"
- VALUE "OriginalFilename", "Stars45.exe\0"
- VALUE "ProductName", "Starshatter: The Open Source Project\0"
- VALUE "ProductVersion", "@VERSION@\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
diff --git a/StarsEx/resource.h b/StarsEx/resource.h
deleted file mode 100644
index 4dd9864..0000000
--- a/StarsEx/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef resource_h
-#define resource_h
-
-#define Stars 100
-
-#endif // resource_h
generated by cgit v1.1 at 2024-06-02 21:51:55 +0000