From: Matze B. <mat...@us...> - 2002-02-22 17:21:34
|
Update of /cvsroot/planeshift/planeshift/mk/mingw In directory usw-pr-cvs1:/tmp/cvs-serv10718/mk/mingw Modified Files: mingw.mak Log Message: -mysql build fixes -made code a bit more robust towards errors Index: mingw.mak =================================================================== RCS file: /cvsroot/planeshift/planeshift/mk/mingw/mingw.mak,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** mingw.mak 20 Feb 2002 16:19:58 -0000 1.28 --- mingw.mak 22 Feb 2002 17:21:31 -0000 1.29 *************** *** 4,12 **** PSSERVER=psserver$(EXE) DBDUMMY=dbdummy$(DLL) PSCLIENT=psclient$(EXE) PSGUI=psgui$(DLL) CLIENTRPGRULES=clientrpgrules$(DLL) ! TARGETS= $(PSSERVER) $(DBDUMMY) $(PSCLIENT) $(PSGUI) $(CLIENTRPGRULES) #--------- --- 4,13 ---- PSSERVER=psserver$(EXE) + DBMYSQL=dbmysql$(DLL) DBDUMMY=dbdummy$(DLL) PSCLIENT=psclient$(EXE) PSGUI=psgui$(DLL) CLIENTRPGRULES=clientrpgrules$(DLL) ! TARGETS= $(PSSERVER) $(DBMYSQL) $(DBDUMMY) $(PSCLIENT) $(PSGUI) $(CLIENTRPGRULES) #--------- *************** *** 71,74 **** --- 72,80 ---- PSSERVER_CFLAGS=-I./src/common + DBMYSQL_SRC= ./src/server/database/mysql/dal.cpp ./src/server/database/mysql/psdatabase.cpp + DBMYSQL_OBJS=$(addsuffix .o, $(basename $(DBMYSQL_SRC))) + DBMYSQL_ADDOBJS= + DBMYSQL_CFLAGS=-I./src/common -I./src/server + DBDUMMY_SRC= DBDUMMY_OBJS=$(addsuffix .o, $(basename $(DBDUMMY_SRC))) *************** *** 138,141 **** --- 144,153 ---- $(DO.EXEC) $(LINKFLAGS) + $(DBMYSQL_OBJS): %.o : %.cpp + $(CCC) $(CXXFLAGS) $(DBMYSQL_CFLAGS) -c $< -o $@ + + $(DBMYSQL): $(DBMYSQL_OBJS) $(DBMYSQL_ADDOBJS) + $(DO.PLUGIN) $(LINKFLAGS) + $(DBDUMMY_OBJS): %.o : %.cpp $(CCC) $(CXXFLAGS) $(DBDUMMY_CFLAGS) -c $< -o $@ *************** *** 173,176 **** --- 185,189 ---- $(RM) -f $(LIBPSBEHAVE_OBJS) $(RM) -f $(PSSERVER_OBJS) + $(RM) -f $(DBMYSQL_OBJS) $(RM) -f $(DBDUMMY_OBJS) $(RM) -f $(PSCLIENT_OBJS) *************** *** 192,195 **** --- 205,209 ---- gcc -MM $(CXXFLAGS) $(LIBPSBEHAVE_CFLAGS) $(LIBPSBEHAVE_SRC) >> makefile.dep gcc -MM $(CXXFLAGS) $(PSSERVER_CFLAGS) $(PSSERVER_SRC) >> makefile.dep + gcc -MM $(CXXFLAGS) $(DBMYSQL_CFLAGS) $(DBMYSQL_SRC) >> makefile.dep gcc -MM $(CXXFLAGS) $(DBDUMMY_CFLAGS) $(DBDUMMY_SRC) >> makefile.dep gcc -MM $(CXXFLAGS) $(PSCLIENT_CFLAGS) $(PSCLIENT_SRC) >> makefile.dep |