Skip to content

fix ninjamcast to compile #10

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

Open
federicobriata wants to merge 1 commit into
base: main
Choose a base branch
from
+47 −13
Open

fix ninjamcast to compile #10

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
36 changes: 36 additions & 0 deletions ninjam/ninjamcast/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
CC=gcc
CXX=g++
CFLAGS = -O2

OBJS = njcast.o
OBJS += ninjamcast.o

ifdef MAC
CFLAGS += -D_MAC
LFLAGS = -framework coreaudio -lncurses.5 -lm
else
LFLAGS = -lncurses -ldl -lm -lasound -lvorbis -lvorbisenc -logg -lmp3lame
endif

OBJS += ../../WDL/jnetlib/asyncdns.o
OBJS += ../../WDL/jnetlib/connection.o
OBJS += ../../WDL/jnetlib/listen.o
OBJS += ../../WDL/jnetlib/util.o
OBJS += ../../WDL/jnetlib/httpget.o
OBJS += ../../WDL/lameencdec.o
OBJS += ../../WDL/rng.o
OBJS += ../../WDL/sha.o
OBJS += ../mpb.o
OBJS += ../netmsg.o
OBJS += ../njclient.o
OBJS += ../njmisc.o

CXXFLAGS = $(CFLAGS)

default: ninjamcast

ninjamcast: $(OBJS)
$(CXX) $(CXXFLAGS) -o ninjamcast $(OBJS) -lpthread $(LFLAGS)

clean:
-rm $(OBJS) ninjamcast
24 changes: 11 additions & 13 deletions ninjam/ninjamcast/ninjamcast.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void usage()
}

// heh we don't upload anything anyway
int displayLicense(int user32, char *licensetext) {
int displayLicense(void* user32, const char *licensetext) {
return 1;
}

Expand Down Expand Up @@ -157,13 +157,13 @@ static int ConfigOnToken(LineParser *lp)

if (!stricmp(t,"SC_Server_Name")) {
if (lp->getnumtokens() != 2) return -1;
char *p=lp->gettoken_str(1);
const char *p=lp->gettoken_str(1);
if (!p || !*p) return -2;
strncpy(g_sc_streamname, p, sizeof(g_sc_streamname)-1);
} else
if (!stricmp(t,"SC_Server_Address")) {
if (lp->getnumtokens() != 2) return -1;
char *p=lp->gettoken_str(1);
const char *p=lp->gettoken_str(1);
if (!p || !*p) return -2;
strncpy(g_sc_address, p, sizeof(g_sc_address)-1);
} else
Expand All @@ -175,13 +175,13 @@ static int ConfigOnToken(LineParser *lp)
} else
if (!stricmp(t,"SC_Server_Password")) {
if (lp->getnumtokens() != 2) return -1;
char *p=lp->gettoken_str(1);
const char *p=lp->gettoken_str(1);
if (!p || !*p) return -2;
strncpy(g_sc_pass, p, sizeof(g_sc_pass)-1);
} else
if (!stricmp(t,"SC_Server_Genre")) {
if (lp->getnumtokens() != 2) return -1;
char *p=lp->gettoken_str(1);
const char *p=lp->gettoken_str(1);
if (!p || !*p) return -2;
strncpy(g_sc_genre, p, sizeof(g_sc_genre)-1);
} else
Expand All @@ -193,7 +193,7 @@ static int ConfigOnToken(LineParser *lp)
} else
if (!stricmp(t,"SC_Server_Url")) {
if (lp->getnumtokens() != 2) return -1;
char *p=lp->gettoken_str(1);
const char *p=lp->gettoken_str(1);
if (!p || !*p) return -2;
strncpy(g_sc_url, p, sizeof(g_sc_url)-1);
} else
Expand All @@ -217,25 +217,25 @@ static int ConfigOnToken(LineParser *lp)
} else
if (!stricmp(t,"NJ_Address")) {
if (lp->getnumtokens() != 2) return -1;
char *p=lp->gettoken_str(1);
const char *p=lp->gettoken_str(1);
if (!p || !*p) return -2;
strncpy(g_nj_address, p, sizeof(g_nj_address)-1);
} else
if (!stricmp(t,"NJ_User")) {
if (lp->getnumtokens() != 2) return -1;
char *p=lp->gettoken_str(1);
const char *p=lp->gettoken_str(1);
if (!p || !*p) return -2;
strncpy(g_nj_user, p, sizeof(g_nj_user)-1);
} else
if (!stricmp(t,"NJ_Password")) {
if (lp->getnumtokens() != 2) return -1;
char *p=lp->gettoken_str(1);
const char *p=lp->gettoken_str(1);
if (!p || !*p) return -2;
strncpy(g_nj_pass, p, sizeof(g_nj_pass)-1);
} else
if (!stricmp(t,"NJ_Session_Dir")) {
if (lp->getnumtokens() != 2) return -1;
char *p=lp->gettoken_str(1);
const char *p=lp->gettoken_str(1);
if (!p || !*p) return -2;
g_nj_sessiondir.Set(p);
} else
Expand All @@ -249,14 +249,13 @@ static void readConfig(const char *configfile="njcast.cfg") {

if (fp != NULL) {
int linecnt=0;
bool comment_state=0;
char buf[8192];
WDL_String linebuild;
while (fgets(buf, sizeof(buf), fp)) {
linecnt++;
if (buf[strlen(buf)-1]=='\n') buf[strlen(buf)-1]=0;

LineParser lp(comment_state);
LineParser lp;

if (buf[0] && buf[strlen(buf)-1]=='\\')
{
Expand All @@ -282,7 +281,6 @@ static void readConfig(const char *configfile="njcast.cfg") {
}
else
{
comment_state = lp.InCommentBlock();

if (lp.getnumtokens()>0)
{
Expand Down