-CPP = g++.exe -D__DEBUG__ -DHAVE_MINGW
-CC = gcc.exe -D__DEBUG__ -DHAVE_MINGW
+CPP = g++.exe -D__DEBUG__ -DHAVE_MINGW -DHAVE_WIN32
+CC = gcc.exe -D__DEBUG__ -DHAVE_MINGW -DHAVE_WIN32
WINDRES = windres.exe
RES = wx-console_private.res
-OBJ = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o $(RES)
-LINKOBJ = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o $(RES)
+OBJ = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o wxbconfigpanel.o wxbconfigfileeditor.o wxbhistorytextctrl.o $(RES)
+LINKOBJ = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o wxbconfigpanel.o wxbconfigfileeditor.o wxbhistorytextctrl.o $(RES)
LIBS = -L"../lib" -mwindows -Wl,--subsystem,windows -lbac `wx-config --libs` -g3 /MinGW/lib/libpthreadGC.a
INCS = -I".." -I"../lib" -I"../win32/compat/"
CXXINCS = -I".." -I"../lib" -I"../win32/compat/"
clean: clean-custom
rm -f $(OBJ) $(BIN)
-$(BIN): $(OBJ)
+$(BIN): $(OBJ) ../lib/libbac.a
$(CPP) $(LINKOBJ) -o "wx-console.exe" $(LIBS)
+../lib/libbac.a: ../lib/*.c*
+ (cd ../lib/; make -f Makefile.mingw)
+ @rm -f bacula-fd.exe
+
main.o: main.cpp
$(CPP) -c main.cpp -o main.o $(CXXFLAGS)
wxbutils.o: wxbutils.cpp
$(CPP) -c wxbutils.cpp -o wxbutils.o $(CXXFLAGS)
+wxbconfigpanel.o: wxbconfigpanel.cpp
+ $(CPP) -c wxbconfigpanel.cpp -o wxbconfigpanel.o $(CXXFLAGS)
+
+wxbconfigfileeditor.o: wxbconfigfileeditor.cpp
+ $(CPP) -c wxbconfigfileeditor.cpp -o wxbconfigfileeditor.o $(CXXFLAGS)
+
+wxbhistorytextctrl.o: wxbhistorytextctrl.cpp
+ $(CPP) -c wxbhistorytextctrl.cpp -o wxbhistorytextctrl.o $(CXXFLAGS)
+
wx-console_private.res: wx-console_private.rc
$(WINDRES) -i wx-console_private.rc -I rc -o wx-console_private.res -O coff