diff options
| author | Alexander Pickering <alex@cogarr.net> | 2018-12-18 20:10:10 -0500 |
|---|---|---|
| committer | Alexander Pickering <alex@cogarr.net> | 2018-12-18 20:10:10 -0500 |
| commit | f0d98ad70d2188197be00f6c1a9b7338473c6485 (patch) | |
| tree | 79edaea2cf8e5f13f7919b6971c6995c0a3688bc /src | |
| parent | 2009501214f3c2e3f8d8b1a06432afdf39276bd5 (diff) | |
| download | brokengine-f0d98ad70d2188197be00f6c1a9b7338473c6485.tar.gz brokengine-f0d98ad70d2188197be00f6c1a9b7338473c6485.tar.bz2 brokengine-f0d98ad70d2188197be00f6c1a9b7338473c6485.zip | |
Various fixes to get things working under msys2
Replaced various "make" calls in the makefile with $(MAKE)
Replaced a few __mingw_printf with just printf
Added some instructions to the readme
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/lua_api/gui/iguielement.cpp | 2 | ||||
| -rw-r--r-- | src/shared/lua_api/load_net.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/lua_api/gui/iguielement.cpp b/src/client/lua_api/gui/iguielement.cpp index 4ef5026..4d53ca2 100644 --- a/src/client/lua_api/gui/iguielement.cpp +++ b/src/client/lua_api/gui/iguielement.cpp @@ -177,7 +177,7 @@ int getiguitext(lua_State* L){ lua_pop(L,2);// const wchar_t *t = el->getText(); size_t cstrlen = wcslen(t); - __mingw_printf("In gui get text, cstrlen is %zu\n",cstrlen); + printf("In gui get text, cstrlen is %zu\n",cstrlen); char output[cstrlen + 1];//+1 for \0 wcstombs(output,t,cstrlen); output[cstrlen] = '\0'; diff --git a/src/shared/lua_api/load_net.cpp b/src/shared/lua_api/load_net.cpp index 4baf952..677f1d1 100644 --- a/src/shared/lua_api/load_net.cpp +++ b/src/shared/lua_api/load_net.cpp @@ -313,7 +313,7 @@ void gameloop_net(lua_State* L){ luaL_getmetatable(L,"net.stream");//func,{data=stream} lua_setmetatable(L,-2);//func,{stream} lua_call(L,1,0);// - __mingw_printf("Finished calling gameloop, buf is %p, size is %zu\n",buf,size); + printf("Finished calling gameloop, buf is %p, size is %zu\n",buf,size); nng_msg_free(msgp); printf("called nn_freemsg\n"); free(stream);//We manually set stream->data so free_stream would crash here |