Skip to content

Fix build on manjaro/arch. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2022
Merged

Fix build on manjaro/arch. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ set(SOURCES_TUXMATH
game.c
menu.c
menu_lan.c
mysetenv.c
highscore.c
lessons.c
mathcards.c
Expand Down
5 changes: 2 additions & 3 deletions src/comets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ SDL_Rect player_left_pos = {0};

static help_controls_type help_controls;

SDL_Thread *tts_announcer_thread;

/* Local function prototypes: */
static int comets_initialize(void);
static void comets_cleanup(void);
Expand Down Expand Up @@ -4152,13 +4154,10 @@ int tts_announcer(void *unused)
return 0;
}
void start_tts_announcer_thread(){
extern SDL_Thread *tts_announcer_thread;
tts_announcer_thread = SDL_CreateThread(tts_announcer,NULL);
}

void stop_tts_announcer_thread(){
tts_announcer_switch = 0;
T4K_Tts_stop();
}


2 changes: 1 addition & 1 deletion src/globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ extern char **lesson_list_filenames;
extern int* lesson_list_goldstars;
extern int num_lessons;

SDL_Thread *tts_announcer_thread;
extern SDL_Thread *tts_announcer_thread;

#endif

Expand Down
4 changes: 2 additions & 2 deletions src/menu_lan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "menu_lan.h"


/* lan_player_type now defined in network.h */
lan_player_type lan_player_info[MAX_CLIENTS];
/* lan_player_type now defined in network.h; added extern for lan_player_info so it's only defined once */
extern lan_player_type lan_player_info[MAX_CLIENTS];

/* Local function prototypes: ------------------- */
void draw_player_table(void);
Expand Down