Skip to content

Commit c2536d1

Browse files
tophyrtophyr
committed
Add ANDROID to __LINUX__ ifdefs
1 parent bf2c402 commit c2536d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+190
-189
lines changed

‎Descent3/BriefingParse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#ifndef __BRIEFPARSE_H_
5151
#define __BRIEFPARSE_H_
5252

53-
#if defined(__LINUX__)
53+
#if defined(__LINUX__) || defined(ANDROID)
5454
#include "linux_fix.h" //for stricmp
5555
#endif
5656

‎Descent3/ConfigItem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
#include "newui.h"
6060

61-
#if defined(__LINUX__)
61+
#if defined(__LINUX__) || defined(ANDROID)
6262
void CIListBoxCallback(int ID, void *);
6363
void CISliderCallback(int ID, void *);
6464
#endif

‎Descent3/Game2DLL.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ struct game_api {
9292
tOSIRISModuleInit *osiris_functions;
9393
};
9494
// The exported DLL function call prototypes
95-
#if defined(__LINUX__)
95+
#if defined(__LINUX__) || defined(ANDROID)
9696
typedef void DLLFUNCCALL (*DLLGameCall_fp)(int eventnum, dllinfo *data);
9797
typedef void DLLFUNCCALL (*DLLGameInit_fp)(int *api_func, uint8_t *all_ok, int num_teams_to_use);
9898
typedef void DLLFUNCCALL (*DLLGameClose_fp)();

‎Descent3/LoadLevel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3240,7 +3240,7 @@ void ReadTerrainSkyAndLightChunk(CFILE *fp, int version) {
32403240

32413241
Terrain_sky.flags = cf_ReadInt(fp);
32423242

3243-
#ifdef __LINUX__
3243+
#if defined(__LINUX__) || defined(ANDROID)
32443244
if (FindArg("-noterrainfog") > 0) {
32453245
Terrain_sky.flags &= ~TF_FOG;
32463246
}

‎Descent3/OsirisLoadandBind.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ bool Show_osiris_debug = false;
438438
// 0, only when the level ends
439439

440440
// The exported DLL function call prototypes
441-
#if defined(__LINUX__)
441+
#if defined(__LINUX__) || defined(ANDROID)
442442
typedef char DLLFUNCCALL (*InitializeDLL_fp)(tOSIRISModuleInit *function_list);
443443
typedef void DLLFUNCCALL (*ShutdownDLL_fp)(void);
444444
typedef int DLLFUNCCALL (*GetGOScriptID_fp)(const char *name, uint8_t isdoor);
@@ -3144,7 +3144,7 @@ int Osiris_ExtractScriptsFromHog(int library_handle, bool is_mission_hog) {
31443144
int count = 0;
31453145

31463146
const char *script_extension;
3147-
#if defined(__LINUX__)
3147+
#if defined(__LINUX__) || defined(ANDROID)
31483148
#if defined(MACOSX)
31493149
script_extension = "*.dylib";
31503150
#else
@@ -4037,4 +4037,3 @@ void Osiris_CreateModuleInitStruct(tOSIRISModuleInit *mi) {
40374037
mi->fp[i] = NULL;
40384038
}
40394039
}
4040-

‎Descent3/config.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ struct video_menu {
679679
sheet->AddLongRadioButton("1600x1200");
680680
*resolution = iTemp;
681681

682-
#if !defined(__LINUX__)
682+
#if !defined(__LINUX__) && !defined(ANDROID)
683683
// renderer bit depth
684684
switch (Render_preferred_bitdepth) {
685685
case 16:
@@ -708,7 +708,7 @@ struct video_menu {
708708

709709
sheet->NewGroup(TXT_MONITOR, 0, 180);
710710
vsync = sheet->AddLongCheckBox(TXT_CFG_VSYNCENABLED, (Render_preferred_state.vsync_on != 0));
711-
#ifndef __LINUX__
711+
#if !defined(__LINUX__) && !defined(ANDROID)
712712
sheet->AddText("");
713713
sheet->AddLongButton(TXT_AUTO_GAMMA, IDV_AUTOGAMMA);
714714
#endif
@@ -723,7 +723,7 @@ struct video_menu {
723723
Render_preferred_state.mipping = (*mipmapping) ? 1 : 0;
724724
if (vsync)
725725
Render_preferred_state.vsync_on = (*vsync) ? 1 : 0;
726-
#if !defined(__LINUX__)
726+
#if !defined(__LINUX__) && !defined(ANDROID)
727727
if (bitdepth)
728728
Render_preferred_bitdepth = (*bitdepth) == 1 ? 32 : 16;
729729
#endif
@@ -753,7 +753,7 @@ struct video_menu {
753753

754754
// process
755755
void process(int res) {
756-
#ifndef __LINUX__
756+
#if !defined(__LINUX__) && !defined(ANDROID)
757757
switch (res) {
758758
case IDV_AUTOGAMMA:
759759
config_gamma();

‎Descent3/credits.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
#include <math.h>
9595
#include "psrand.h"
9696

97-
#if defined(__LINUX__)
97+
#if defined(__LINUX__) || defined(ANDROID)
9898
#include "linux_fix.h"
9999
#endif
100100

‎Descent3/dedicated_server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
#include <string.h>
109109
#include <stdlib.h>
110110

111-
#ifndef __LINUX__
111+
#if !defined(__LINUX__) && !defined(ANDROID)
112112
typedef int socklen_t;
113113
#endif
114114

@@ -788,7 +788,7 @@ void PrintDedicatedMessage(const char *fmt, ...) {
788788
DedicatedSocketputs(buf);
789789
}
790790

791-
#ifdef __LINUX__
791+
#if defined(__LINUX__) || defined(ANDROID)
792792
#include <netinet/in.h>
793793
#include <arpa/inet.h>
794794
#include <sys/socket.h>

‎Descent3/gamesave.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ struct tLoadGameDialogData {
510510
chunked_bitmap chunk;
511511
};
512512

513-
#if defined(__LINUX__)
513+
#if defined(__LINUX__) || defined(ANDROID)
514514
void LoadGameDialogCB(newuiTiledWindow *wnd, void *data)
515515
#else
516516
void __cdecl LoadGameDialogCB(newuiTiledWindow *wnd, void *data)

‎Descent3/matcen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1904,7 +1904,7 @@ void InitMatcens() {
19041904
atexit(DestroyAllMatcens);
19051905
}
19061906

1907-
#if defined(__LINUX__)
1907+
#if defined(__LINUX__) || defined(ANDROID)
19081908
void DestroyAllMatcens()
19091909
#else
19101910
void __cdecl DestroyAllMatcens()

‎Descent3/mission_download.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ int msn_ExtractZipFile(char *zipfilename, char *mn3name) {
826826
return 1;
827827
}
828828

829-
#ifdef __LINUX__
829+
#if defined(__LINUX__) || defined(ANDROID)
830830
char *_strlwr(char *string) {
831831
char *ptr = string;
832832
while (*ptr) {

‎Descent3/mmItem.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ enum tmmItemFX {
103103
void MenuScene(); // display menu scene
104104
/////////////////////////////////////////////////////////////////////
105105
// gcc doesn't like the tQueue template in psclass.h
106-
#ifdef __LINUX__
106+
#if defined(__LINUX__) || defined(ANDROID)
107107
// tQueue
108108
// a circular queue implementation
109109
class tmmItemQueue {
@@ -144,7 +144,7 @@ class mmItem : public UIGadget {
144144
int16_t m_alpha; // alpha for text item
145145
int16_t m_satcount;
146146
tmmItemFX m_curfx; // current effect
147-
#ifndef __LINUX__
147+
#if !defined(__LINUX__) && !defined(ANDROID)
148148
tQueue<tmmItemFX, 8> m_fxqueue; // special effects queue
149149
#else
150150
tmmItemQueue m_fxqueue;

‎Descent3/multi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@
498498
#include "object_external.h"
499499
#include "player_external.h"
500500

501-
#if defined(__LINUX__)
501+
#if defined(__LINUX__) || defined(ANDROID)
502502
#include "linux_fix.h"
503503
#endif
504504

‎Descent3/multi_dll_mgr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ extern bool Multi_Gamelist_changed;
328328
int CheckMissionForScript(char *mission, char *script, int dedicated_server_num_teams);
329329
void ShowNetgameInfo(network_game *game);
330330
// The exported DLL function call prototypes
331-
#if defined(__LINUX__)
331+
#if defined(__LINUX__) || defined(ANDROID)
332332
typedef void DLLFUNCCALL (*DLLMultiCall_fp)(int eventnum);
333333
typedef void DLLFUNCCALL (*DLLMultiScoreCall_fp)(int eventnum, void *data);
334334
typedef void DLLFUNCCALL (*DLLMultiInit_fp)(int *api_fp);

‎Descent3/multi_external.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
#ifndef __MULTI_EXTERNAL_H_
108108
#define __MULTI_EXTERNAL_H_
109109

110-
#if defined(__LINUX__)
110+
#if defined(__LINUX__) || defined(ANDROID)
111111
#include <cstring>
112112
#include <cstdint>
113113
typedef uintptr_t DWORD;

‎Descent3/newui.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
#ifndef NEWUI_H
188188
#define NEWUI_H
189189

190-
#if defined(__LINUX__)
190+
#if defined(__LINUX__) || defined(ANDROID)
191191
#include "linux_fix.h" //fix some of the stricmp's
192192
#endif
193193

‎Descent3/sdlmain.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@ void just_exit(void) {
143143
#endif
144144

145145
SDL_Quit();
146-
#ifdef __LINUX__
146+
#if defined(__LINUX__) || defined(ANDROID)
147147
sync(); // just in case.
148148
#endif
149149
_exit(0);
150150
}
151151

152-
#ifdef __LINUX__
152+
#if defined(__LINUX__) || defined(ANDROID)
153153
void fatal_signal_handler(int signum) {
154154
switch (signum) {
155155
case SIGHUP:
@@ -612,7 +612,7 @@ int main(int argc, char *argv[]) {
612612
}
613613

614614
bool run_d3 = true;
615-
#ifdef __LINUX__
615+
#if defined(__LINUX__) || defined(ANDROID)
616616
if (flags & APPFLAG_USESERVICE) {
617617
run_d3 = false;
618618
pid_t np = fork();

‎Descent3/terrainrender.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2717,7 +2717,7 @@ static g3Point *slist[256];
27172717
// Draws the 2 triangles of the Terrainlist[index] (software)
27182718
int DrawTerrainTrianglesSoftware(int index, int bm_handle, int upper_left, int lower_right) {
27192719
/*
2720-
#ifndef __LINUX__
2720+
#if !defined(__LINUX__) && !defined(ANDROID)
27212721
int i,tlist[4],close=0,lit=0;
27222722
float closest_z=9999;
27232723
int color;

‎bitmap/lightmap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "bitmap.h"
2525
#include "mono.h"
2626
#include "mem.h"
27-
#ifndef __LINUX__
27+
#if !defined(__LINUX__) && !defined(ANDROID)
2828
#include "Macros.h"
2929
#endif
3030

‎cfile/cfile.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <cctype>
2525
#include <memory>
2626
#include <vector>
27-
#ifndef __LINUX__
27+
#if !defined(__LINUX__) && !defined(ANDROID)
2828
// Non-Linux Build Includes
2929
#include <io.h>
3030
#else
@@ -113,7 +113,7 @@ int cf_OpenLibrary(const char *libname) {
113113

114114
// allocation library structure
115115
std::shared_ptr<library> lib = std::make_shared<library>();
116-
#ifdef __LINUX__
116+
#if defined(__LINUX__) || defined(ANDROID)
117117
// resolve library name
118118
char t_dir[_MAX_PATH];
119119
char t_file[_MAX_PATH];
@@ -394,7 +394,7 @@ CFILE *open_file_in_lib(const char *filename) {
394394
return nullptr;
395395
}
396396

397-
#ifdef __LINUX__
397+
#if defined(__LINUX__) || defined(ANDROID)
398398
#include <glob.h>
399399

400400
static int globerrfn(const char *path, int err) {
@@ -641,7 +641,7 @@ CFILE *open_file_in_directory(const char *filename, const char *mode, const char
641641
// try to open file
642642
fp = fopen(path, tmode);
643643

644-
#ifdef __LINUX__
644+
#if defined(__LINUX__) || defined(ANDROID)
645645
// for Filesystems with case sensitive files we'll check for different versions of the filename
646646
// with different case's.
647647
if (fp) {

‎cfile/cfile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ int cf_OpenLibrary(const char *libname);
153153
// Parameters: handle: the handle returned by cf_OpenLibrary()
154154
void cf_CloseLibrary(int handle);
155155

156-
#ifdef __LINUX__
156+
#if defined(__LINUX__) || defined(ANDROID)
157157
// Maps fixed case file name to actual case on disk
158158
// Parameters: directory: optional directory to search within (can be NULL)
159159
// filename: the fixed case name to map to reality

‎ddebug/debug.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
#define IDNO 7
134134
#endif
135135
// #define DEBUG_LEVEL 0 //DAJ
136-
#if defined(WIN32) || defined(__LINUX__)
136+
#if defined(WIN32) || defined(__LINUX__) || defined(ANDROID)
137137
constexpr const int OSMBOX_OK = 1;
138138
constexpr const int OSMBOX_YESNO = 2;
139139
constexpr const int OSMBOX_YESNOCANCEL = 3;
@@ -172,7 +172,7 @@ void Debug_ConsolePrintfAt(int n, int row, int col, const char *format, ...);
172172
#if !defined(RELEASE)
173173
#include "debugbreak.h"
174174
#if defined(WIN32)
175-
#elif defined(__LINUX__)
175+
#elif defined(__LINUX__) || defined(ANDROID)
176176
void ddio_InternalKeyClose();
177177
#else
178178
#define debug_break()

‎ddio/lnxio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ bool ddio_GetBinaryPath(char *exec_path, size_t len) {
118118
fprintf(stderr, "Buffer too small; need size %u\n", size);
119119
return false;
120120
}
121-
#elif defined(__LINUX__)
121+
#elif defined(__LINUX__) || defined (ANDROID)
122122
if (realpath("/proc/self/exe", exec_path) == NULL) {
123123
perror("realpath");
124124
return false;

‎legacy/briefinglocalizer/briefinglocalizerDlg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "briefinglocalizer.h"
2424
#include "briefinglocalizerDlg.h"
2525

26-
#ifdef __LINUX__
26+
#if defined(__LINUX__) || defined(ANDROID)
2727
#include "linux_fix.h"
2828
#endif
2929

0 commit comments

Comments
 (0)