From: Nicolas Boichat <nicolas@boichat.ch>
Date: Thu, 29 Apr 2004 20:35:45 +0000 (+0000)
Subject: added wxbconfigpanel.cpp
X-Git-Tag: Release-1.34.3~77
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0b88acf909046a858fc1453ce1004fa90935f2c3;p=bacula%2Fbacula

added wxbconfigpanel.cpp


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1323 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/win32/wx-console/filelist b/bacula/src/win32/wx-console/filelist
index 2a4dab558d..8067dbf2dd 100644
--- a/bacula/src/win32/wx-console/filelist
+++ b/bacula/src/win32/wx-console/filelist
@@ -50,3 +50,4 @@
 ..\..\wx-console\wxbtableparser
 ..\..\wx-console\wxbtreectrl
 ..\..\wx-console\wxbutils
+..\..\wx-console\wxbconfigpanel
diff --git a/bacula/src/win32/wx-console/wx-console.mak b/bacula/src/win32/wx-console/wx-console.mak
index 68a910e651..18fa0eb0f3 100644
--- a/bacula/src/win32/wx-console/wx-console.mak
+++ b/bacula/src/win32/wx-console/wx-console.mak
@@ -92,6 +92,7 @@ CLEAN :
 	-@erase "$(INTDIR)\wxbtableparser.obj"
 	-@erase "$(INTDIR)\wxbtreectrl.obj"
 	-@erase "$(INTDIR)\wxbutils.obj"
+	-@erase "$(INTDIR)\wxbconfigpanel.obj"
         -@erase "$(OUTDIR)\wx-console.exe"
 
 "$(OUTDIR)" :
@@ -161,6 +162,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\wxbtableparser.obj" \
 	"$(INTDIR)\wxbtreectrl.obj" \
 	"$(INTDIR)\wxbutils.obj" \
+	"$(INTDIR)\wxbconfigpanel.obj" \
         "$(INTDIR)\wx-console_private.res"
 
 "$(OUTDIR)\wx-console.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -283,6 +285,8 @@ CLEAN :
 	-@erase "$(INTDIR)\wxbtreectrl.sbr"
 	-@erase "$(INTDIR)\wxbutils.obj
 	-@erase "$(INTDIR)\wxbutils.sbr"
+	-@erase "$(INTDIR)\wxbconfigpanel.obj
+	-@erase "$(INTDIR)\wxbconfigpanel.sbr"
         -@erase "$(OUTDIR)\wx-console.exe"
         -@erase "$(OUTDIR)\wx-console.bsc"
 
@@ -347,6 +351,7 @@ BSC32_SBRS= \
 	"$(INTDIR)\wxbtableparser.sbr" \
 	"$(INTDIR)\wxbtreectrl.sbr" \
 	"$(INTDIR)\wxbutils.sbr" \
+	"$(INTDIR)\wxbconfigpanel.sbr" \
 
 "$(OUTDIR)\wx-console.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
     $(BSC32) @<<
@@ -411,6 +416,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\wxbtableparser.obj" \
 	"$(INTDIR)\wxbtreectrl.obj" \
 	"$(INTDIR)\wxbutils.obj" \
+	"$(INTDIR)\wxbconfigpanel.obj" \
         "$(INTDIR)\wx-console_private.res"
 
 "$(OUTDIR)\wx-console.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -1452,4 +1458,23 @@ SOURCE=..\..\wx-console\wxbutils.cpp
 !ENDIF 
 
 
+FILENAME=wxbconfigpanel
+SOURCE=..\..\wx-console\wxbconfigpanel.cpp
+!IF  "$(CFG)" == "wx-console - Win32 Release"
+
+
+"$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
+
+
+"$(INTDIR)\$(FILENAME).obj"	"$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
 
diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in
index e47736baba..6705508cfe 100644
--- a/bacula/src/wx-console/Makefile.in
+++ b/bacula/src/wx-console/Makefile.in
@@ -21,9 +21,11 @@ dummy:
 
 #
 CONSSRCS = main.cpp console_thread.cpp authenticate.c console_conf.c wxbrestorepanel.cpp \
-	     wxbmainframe.cpp wxbtableparser.cpp wxbtreectrl.cpp wxblistctrl.cpp wxbutils.cpp
+	     wxbmainframe.cpp wxbtableparser.cpp wxbtreectrl.cpp wxblistctrl.cpp wxbutils.cpp \
+	     wxbconfigpanel.cpp
 CONSOBJS = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o \
-	     wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o
+	     wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o \
+	     wxbconfigpanel.o
 
 win32 = wx-console_private.res
 
diff --git a/bacula/src/wx-console/Makefile.mingw b/bacula/src/wx-console/Makefile.mingw
index 89612811a3..218f279162 100644
--- a/bacula/src/wx-console/Makefile.mingw
+++ b/bacula/src/wx-console/Makefile.mingw
@@ -2,8 +2,8 @@ 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 $(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 $(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/" 
@@ -23,7 +23,7 @@ $(BIN): $(OBJ) ../lib/libbac.a
 	$(CPP) $(LINKOBJ) -o "wx-console.exe" $(LIBS)
 
 ../lib/libbac.a: ../lib/*.c*
-	(cd ../lib/; $(MAKE) -f Makefile.mingw DESTDIR=$(DESTDIR))
+	(cd ../lib/; make -f Makefile.mingw)
 	@rm -f bacula-fd.exe
 
 main.o: main.cpp
@@ -56,5 +56,8 @@ wxblistctrl.o: wxblistctrl.cpp
 wxbutils.o: wxbutils.cpp
 	$(CPP) -c wxbutils.cpp -o wxbutils.o $(CXXFLAGS)
 
+wxbconfigpanel.o: wxbconfigpanel.cpp
+	$(CPP) -c wxbconfigpanel.cpp -o wxbconfigpanel.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