From e8895cee5d196ce02916782033e48bf5a5135e3d Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Sat, 17 Apr 2004 22:21:01 +0000 Subject: [PATCH] Added wxbutils.cpp, win32 test corrected. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1229 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/wx-console/Makefile.in | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in index 08c058cf79..48f814af84 100644 --- a/bacula/src/wx-console/Makefile.in +++ b/bacula/src/wx-console/Makefile.in @@ -21,22 +21,17 @@ dummy: # CONSSRCS = main.cpp console_thread.cpp authenticate.c console_conf.c wxbrestorepanel.cpp \ - wxbmainframe.cpp wxbtableparser.cpp wxbtreectrl.cpp wxblistctrl.cpp + wxbmainframe.cpp wxbtableparser.cpp wxbtreectrl.cpp wxblistctrl.cpp wxbutils.cpp CONSOBJS = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o \ - wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o + wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o -@if test "@DISTNAME@" = "cygwin" then \ -RES = wx-console_private.res; \ -else \ -RES = ;\ -fi +win32 = wx-console_private.res + +WIN32RES = $(@WIN32@) # these are the objects that are changed by the .configure process EXTRAOBJS = @OBJLIST@ -CONS_INC= -CONS_LIBS= - # wx-config generated by configure CONS_CPPFLAGS=@WXCONS_CPPFLAGS@ CONS_LDFLAGS=@WXCONS_LDFLAGS@ @@ -61,14 +56,17 @@ all: Makefile wx-console @echo " " -wx-console: $(CONSOBJS) $(RES) ../lib/libbac.a - $(CXX) $(CONSOBJS) $(RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) -lbac +wx-console: $(CONSOBJS) @WIN32@ ../lib/libbac.a + $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) -lbac + +win32: wx-console_private.res + wx-console_private.res: wx-console_private.rc windres.exe -i wx-console_private.rc -I rc -o wx-console_private.res -O coff clean: - @$(RMF) $(OBJ) wx-console + @$(RMF) $(OBJ) wx-console $(WIN32RES) distclean: clean $(RMF) Makefile -- 2.39.5