Skip to content

Commit

Permalink
fix compilation errors and android build
Browse files Browse the repository at this point in the history
  • Loading branch information
emawind84 committed Feb 12, 2024
1 parent 7eb109b commit 04a7097
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 9 deletions.
26 changes: 18 additions & 8 deletions mobile/Android_src.mk
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ PCH_SOURCES = \
playsim/bots/b_think.cpp \
bbannouncer.cpp \
console/c_cmds.cpp \
console/c_console.cpp \
console/c_notifybuffer.cpp \
console/c_functions.cpp \
ct_chat.cpp \
d_iwad.cpp \
Expand All @@ -197,7 +197,6 @@ PCH_SOURCES = \
gameconfigfile.cpp \
gitinfo.cpp \
hu_scores.cpp \
i_net.cpp \
m_cheat.cpp \
m_misc.cpp \
playsim/p_acs.cpp \
Expand Down Expand Up @@ -307,15 +306,9 @@ PCH_SOURCES = \
maploader/renderinfo.cpp \
maploader/compatibility.cpp \
maploader/postprocessor.cpp \
menu/joystickmenu.cpp \
menu/menu.cpp \
menu/messagebox.cpp \
menu/optionmenu.cpp \
menu/resolutionmenu.cpp \
menu/doommenu.cpp \
menu/loadsavemenu.cpp \
menu/playermenu.cpp \
menu/menudef.cpp \
menu/profiledef.cpp \
gamedata/textures/animations.cpp \
gamedata/textures/anim_switches.cpp \
Expand Down Expand Up @@ -396,6 +389,7 @@ PCH_SOURCES = \
common/textures/skyboxtexture.cpp \
common/textures/animtexture.cpp \
common/textures/v_collection.cpp \
common/textures/animlib.cpp \
common/textures/formats/automaptexture.cpp \
common/textures/formats/brightmaptexture.cpp \
common/textures/formats/buildtexture.cpp \
Expand All @@ -414,6 +408,7 @@ PCH_SOURCES = \
common/textures/formats/shadertexture.cpp \
common/textures/formats/tgatexture.cpp \
common/textures/formats/stbtexture.cpp \
common/textures/formats/anmtexture.cpp \
common/textures/hires/hqresize.cpp \
common/models/models_md3.cpp \
common/models/models_md2.cpp \
Expand All @@ -429,6 +424,10 @@ PCH_SOURCES = \
common/console/c_consolebuffer.cpp \
common/console/c_cvars.cpp \
common/console/c_dispatch.cpp \
common/console/c_commandbuffer.cpp \
common/console/c_console.cpp \
common/console/c_notifybufferbase.cpp \
common/console/c_tabcomplete.cpp \
common/console/c_expr.cpp \
common/utility/engineerrors.cpp \
common/utility/i_module.cpp \
Expand All @@ -446,6 +445,7 @@ PCH_SOURCES = \
common/utility/zstrformat.cpp \
common/utility/name.cpp \
common/utility/r_memory.cpp \
common/thirdparty/base64.cpp \
common/thirdparty/md5.cpp \
common/thirdparty/superfasthash.cpp \
common/filesystem/filesystem.cpp \
Expand All @@ -458,14 +458,17 @@ PCH_SOURCES = \
common/filesystem/file_zip.cpp \
common/filesystem/file_pak.cpp \
common/filesystem/file_whres.cpp \
common/filesystem/file_ssi.cpp \
common/filesystem/file_directory.cpp \
common/filesystem/resourcefile.cpp \
common/engine/cycler.cpp \
common/engine/d_event.cpp \
common/engine/date.cpp \
common/engine/stats.cpp \
common/engine/sc_man.cpp \
common/engine/palettecontainer.cpp \
common/engine/stringtable.cpp \
common/engine/i_net.cpp \
common/engine/i_interface.cpp \
common/engine/renderstyle.cpp \
common/engine/v_colortables.cpp \
Expand All @@ -475,6 +478,13 @@ PCH_SOURCES = \
common/objects/dobject.cpp \
common/objects/dobjgc.cpp \
common/objects/dobjtype.cpp \
common/menu/joystickmenu.cpp \
common/menu/menu.cpp \
common/menu/messagebox.cpp \
common/menu/optionmenu.cpp \
common/menu/resolutionmenu.cpp \
common/menu/menudef.cpp \
common/menu/savegamemanager.cpp \
common/rendering/v_framebuffer.cpp \
common/rendering/v_video.cpp \
common/rendering/r_thread.cpp \
Expand Down
2 changes: 1 addition & 1 deletion src/common/rendering/hwrenderer/data/hw_vrmodes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "v_video.h"
#include "version.h"
#include "i_interface.h"
#include "menu/menu.h"
#include "menu.h"
#include "gl_load/gl_system.h"
#include "gl_renderer.h"
#include "gl/stereo3d/gl_openxrdevice.h"
Expand Down
2 changes: 2 additions & 0 deletions src/common/thirdparty/base64.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#ifndef BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A
#define BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A

#include "tarray.h"

TArray<uint8_t> base64_encode(unsigned char const* bytes_to_encode, size_t in_len);
void base64_decode(void* memory, size_t len, const char* encoded_string);

Expand Down
1 change: 1 addition & 0 deletions wadsrc/static/zscript/base.zs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ enum ESoundFlags

CHANF_LOOPING = CHANF_LOOP | CHANF_NOSTOP, // convenience value for replicating the old 'looping' boolean.

CHAN_OFFWEAPON = 5, // channel for the offhand weapon
};

// sound attenuation values
Expand Down

0 comments on commit 04a7097

Please sign in to comment.