Corrected the libs order in the root makefiles
The calls to ConfigUtility::Load() also received some tweaks, to use '/' instead of '\' for unix compatability. Also removed -llua from graphics makefile.
This commit is contained in:
@@ -49,11 +49,7 @@ void ClientApplication::Init(int argc, char* argv[]) {
|
|||||||
|
|
||||||
//load the prerequisites
|
//load the prerequisites
|
||||||
ConfigUtility& config = ConfigUtility::GetSingleton();
|
ConfigUtility& config = ConfigUtility::GetSingleton();
|
||||||
#ifdef __unix__
|
|
||||||
config.Load("rsc/config.cfg", argc, argv);
|
config.Load("rsc/config.cfg", argc, argv);
|
||||||
#else
|
|
||||||
config.Load("rsc\\config.cfg", argc, argv);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//-------------------------
|
//-------------------------
|
||||||
//Initialize the APIs
|
//Initialize the APIs
|
||||||
|
|||||||
+7
-3
@@ -1,11 +1,15 @@
|
|||||||
#config
|
#include directories
|
||||||
INCLUDES+=. client_utilities renderable scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
|
INCLUDES+=. client_utilities renderable scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
|
||||||
|
|
||||||
LIBS+=client.a ../libcommon.a -lSDL_net -lSDLmain -lSDL -llua
|
#libraries
|
||||||
ifeq ($(OS),Windows_NT )
|
#the order of the $(LIBS) is important, at least for MinGW
|
||||||
|
LIBS+=client.a ../libcommon.a -lSDL_net
|
||||||
|
ifeq ($(OS),Windows_NT)
|
||||||
LIBS+=-lwsock32 -liphlpapi -lmingw32
|
LIBS+=-lwsock32 -liphlpapi -lmingw32
|
||||||
endif
|
endif
|
||||||
|
LIBS+=-lSDLmain -lSDL
|
||||||
|
|
||||||
|
#flags
|
||||||
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
|
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
|
||||||
|
|
||||||
#source
|
#source
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ $(OUTDIR):
|
|||||||
mkdir $(OUTDIR)
|
mkdir $(OUTDIR)
|
||||||
|
|
||||||
$(OBJDIR)/%.o: %.cpp
|
$(OBJDIR)/%.o: %.cpp
|
||||||
$(CXX) $(CXXFLAGS) -c -o $@ $< -llua
|
$(CXX) $(CXXFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) *.o *.a *.exe
|
$(RM) *.o *.a *.exe
|
||||||
|
|||||||
+6
-2
@@ -1,11 +1,15 @@
|
|||||||
#config
|
#include directories
|
||||||
INCLUDES+=. accounts characters rooms server_utilities ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
|
INCLUDES+=. accounts characters rooms server_utilities ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
|
||||||
|
|
||||||
LIBS+=server.a ../libcommon.a -lSDL_net -lSDLmain -lSDL -llua -lsqlite3
|
#libraries
|
||||||
|
#the order of the $(LIBS) is important, at least for MinGW
|
||||||
|
LIBS+=server.a ../libcommon.a -lSDL_net
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
LIBS+=-lwsock32 -liphlpapi -lmingw32
|
LIBS+=-lwsock32 -liphlpapi -lmingw32
|
||||||
endif
|
endif
|
||||||
|
LIBS+=-lSDLmain -lSDL -llua -lsqlite3
|
||||||
|
|
||||||
|
#flags
|
||||||
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
|
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
|
||||||
|
|
||||||
#source
|
#source
|
||||||
|
|||||||
@@ -40,11 +40,7 @@ void ServerApplication::Init(int argc, char* argv[]) {
|
|||||||
std::cout << "Beginning " << argv[0] << std::endl;
|
std::cout << "Beginning " << argv[0] << std::endl;
|
||||||
|
|
||||||
//load the prerequisites
|
//load the prerequisites
|
||||||
#ifdef __unix__
|
|
||||||
config.Load("rsc/config.cfg", argc, argv);
|
config.Load("rsc/config.cfg", argc, argv);
|
||||||
#else
|
|
||||||
config.Load("rsc\\config.cfg", argc, argv);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//-------------------------
|
//-------------------------
|
||||||
//Initialize the APIs
|
//Initialize the APIs
|
||||||
|
|||||||
Reference in New Issue
Block a user