From 0993789430b0f493375680aabfb4da967f827910 Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Wed, 25 Dec 2024 07:00:41 -0300 Subject: [PATCH] remove Language Defines file we don't do it like that anymore, the build system takes care of it --- Ja2/CMakeLists.txt | 1 - Ja2/Language Defines.cpp | 21 ------- Ja2/Language Defines.h | 119 --------------------------------------- 3 files changed, 141 deletions(-) delete mode 100644 Ja2/Language Defines.cpp delete mode 100644 Ja2/Language Defines.h diff --git a/Ja2/CMakeLists.txt b/Ja2/CMakeLists.txt index d4b60792e..7f8806f90 100644 --- a/Ja2/CMakeLists.txt +++ b/Ja2/CMakeLists.txt @@ -14,7 +14,6 @@ set(Ja2Src "${CMAKE_CURRENT_SOURCE_DIR}/JA2 Splash.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Ja25Update.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/jascreens.cpp" -"${CMAKE_CURRENT_SOURCE_DIR}/Language Defines.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Loading Screen.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/MainMenuScreen.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/MessageBoxScreen.cpp" diff --git a/Ja2/Language Defines.cpp b/Ja2/Language Defines.cpp deleted file mode 100644 index 2c7be02dc..000000000 --- a/Ja2/Language Defines.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "Language Defines.h" - -#if defined(ENGLISH) -# pragma message(" (Language set to ENGLISH, You'll need english CDs)") -#elif defined(GERMAN) -# pragma message(" (Language set to GERMAN, You'll need Topware/german CDs)") -#elif defined(RUSSIAN) -# pragma message(" (Language set to RUSSIAN, You'll need russian CDs)") -#elif defined(DUTCH) -# pragma message(" (Language set to DUTCH, You'll need dutch CDs)") -#elif defined(POLISH) -# pragma message(" (Language set to POLISH, You'll need polish CDs)") -#elif defined(FRENCH) -# pragma message(" (Language set to FRENCH, You'll need french CDs)") -#elif defined(ITALIAN) -# pragma message(" (Language set to ITALIAN, You'll need italian CDs)") -#elif defined(CHINESE) -# pragma message(" (Language set to CHINESE, You'll need chinese CDs)") -#else -# error "At least You have to specify a Language somewhere. See comments above." -#endif diff --git a/Ja2/Language Defines.h b/Ja2/Language Defines.h deleted file mode 100644 index 8032d6997..000000000 --- a/Ja2/Language Defines.h +++ /dev/null @@ -1,119 +0,0 @@ -#ifndef __LANGUAGE_DEFINES_H -#define __LANGUAGE_DEFINES_H - -#pragma once - -/* ============================================================================ - * ONLY ONE OF THESE LANGUAGES CAN BE DEFINED AT A TIME! - * BUT now You can define it _here_ by uncommenting one _or_ (better): - * You can comment them all out and then set it _global_ in "Preprocessor - * options" (do it for ALL projects in the workspace and both debug & release) - * _or_ - * give it do Your MAKEFILE, f.i. make ENGLISH, but keep in mind that some - * weird make tools will require 'make ENGLISH=1' instead - * - * using one of the two later methods will keep this SVN file unchanged for the - * future, only Your private project files (workspace/solution) will differ - * from the SVN stuff. - * (2006-10-10, Sergeant_Kolja) - */ - - -/* The recommend approach for VS2010 multi-language builds is to use the command line or the ja2.props file. - - By default the language is ENGLISH and the Language Prefix is EN. - - There are 3 ways you can build the JA2 1.13 executable file: - - // ------------------------------------------------------- - // 1. Using the command line - // ------------------------------------------------------- - - For example, where msbuild is located in %SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ if not on your path - msbuild.exe /p:Configuration=Release ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=PL /p:JA2Language=POLISH ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=DE /p:JA2Language=GERMAN ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=RU /p:JA2Language=RUSSIAN ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=NL /p:JA2Language=DUTCH ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=FR /p:JA2Language=FRENCH ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=IT /p:JA2Language=ITALIAN ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=CN /p:JA2Language=CHINESE ja2_VS2010.sln - - Note: If you want to build "Unfinished Business" version, just append the /p:JA2Config=JA2UB in the command line - msbuild.exe /p:Configuration=Release /p:JA2Config=JA2UB ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=DE /p:JA2Language=GERMAN /p:JA2Config=JA2UB ja2_VS2010.sln - - Note2: You can also specify the target output name with the parameter /p:TargetName - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=DE /p:JA2Language=GERMAN /p:JA2Config=JA2UB /p:TargetName="JA2UB_113" ja2_VS2010.sln - - // -------------------------------------------------------- - // 2. Editing the ja2.props file and then build in VS 2010 - // ------------------------------------------------------- - - 1. Open the "ja2.props" file in a text editor and set the tags to your likeing. - - For example: If you want to build Russian Version (normal JA2, not UB) then set the following: - - - - - - RU - - - RUSSIAN - - - 2. Save the file - 3. Build the project in Visual Studio 2010 - - // -------------------------------------------------------- - // 3. The "old" way for building the executable - // ------------------------------------------------------- - - 1. Enable the "#undef ENGLISH" define below, so English will not be used anymore - 2. Set the desired language below - 3. If you want to build "Unfinished Business" version, enable "#define JA2UB" and "#define JA2UBMAPS" in builddefines.h" - 4. Build the executable in VS 2005 / 2008 / 2010 - 5. The output will be placed in the "Build\bin\" folder -*/ - -// Only enable this "undef", if you use the 3. way of building the executable! -#undef ENGLISH - -#if !defined(ENGLISH) && !defined(GERMAN) && !defined(RUSSIAN) && !defined(DUTCH) && !defined(POLISH) && !defined(FRENCH) && !defined(ITALIAN) && !defined(CHINESE) -/* please set one manually here (by uncommenting) if not willingly to set Workspace wide */ - -#define ENGLISH -//#define GERMAN -//#define RUSSIAN -//#define DUTCH -//#define FRENCH -//#define ITALIAN -//#define POLISH - -// INFO: For Chinese 1.13 version, you also have to set USE_WINFONTS = 1 in ja2.ini inside your JA2 installation directory! -//#define CHINESE - -#endif - -//**ddd direct link libraries -#pragma comment (lib, "user32.lib") -#pragma comment (lib, "gdi32.lib") -#pragma comment (lib, "advapi32.lib") -#pragma comment (lib, "shell32.lib") - -/* ==================================================================== - * Regardless of if we did it Workspace wide or by uncommenting above, - * HERE we must see, what language was selected. If one, we - */ -#if !defined(ENGLISH) && !defined(GERMAN) && !defined(RUSSIAN) && !defined(DUTCH) && !defined(POLISH) && !defined(FRENCH) && !defined(ITALIAN) && !defined(CHINESE) -# error "At least You have to specify a Language somewhere. See comments above." -#endif - -//if the language represents words as single chars -/*#ifdef TAIWAN - #define SINGLE_CHAR_WORDS -#endif*/ - -#endif