diff options
Diffstat (limited to 'addon/doxywizard')
-rw-r--r-- | addon/doxywizard/Makefile.in | 11 | ||||
-rw-r--r-- | addon/doxywizard/Makefile.win_nmake.in | 3 | ||||
-rw-r--r-- | addon/doxywizard/doxywizard.cpp | 6 | ||||
-rw-r--r-- | addon/doxywizard/doxywizard.pro.in | 12 |
4 files changed, 19 insertions, 13 deletions
diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in index ca5e11d..31ed5e3 100644 --- a/addon/doxywizard/Makefile.in +++ b/addon/doxywizard/Makefile.in @@ -10,9 +10,15 @@ # See the GNU General Public License for more details. # -all: Makefile.doxywizard +all: config.h config.l Makefile.doxywizard $(MAKE) -f Makefile.doxywizard $@ +config.h: + $(CP) ../../src/config.h config.h + +config.l: + $(CP) ../../src/config.l config.l + Makefile.doxywizard: doxywizard.pro $(ENV) $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard @@ -21,9 +27,10 @@ tmake: clean: Makefile.doxywizard $(MAKE) -f Makefile.doxywizard clean + $(RM) config.cpp distclean: clean - $(RM) Makefile.doxywizard + $(RM) Makefile.doxywizard config.l config.h install: $(INSTTOOL) -d $(INSTALL)/bin diff --git a/addon/doxywizard/Makefile.win_nmake.in b/addon/doxywizard/Makefile.win_nmake.in index a9f86a9..5cb4e1c 100644 --- a/addon/doxywizard/Makefile.win_nmake.in +++ b/addon/doxywizard/Makefile.win_nmake.in @@ -30,8 +30,9 @@ tmake: clean: Makefile.doxywizard $(MAKE) -f Makefile.doxywizard clean + $(RM) config.cpp distclean: clean - $(RM) Makefile.doxywizard config.cpp + $(RM) Makefile.doxywizard config.l config.h FORCE: diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp index 1a31b1a..54b592e 100644 --- a/addon/doxywizard/doxywizard.cpp +++ b/addon/doxywizard/doxywizard.cpp @@ -179,7 +179,7 @@ void Wizard::newFile() if (hasChanged) { switch( QMessageBox::warning( this, "DoxyWizard", - "Start a new file and lose changes?\n", + "Start a new file and lose changes?", "Yes", "No", 0, 0, 1 )) { case 0: @@ -219,7 +219,7 @@ void Wizard::loadFile() if (hasChanged) { switch( QMessageBox::warning( - this, "DoxyWizard", "Load a new file and lose changes?\n", + this, "DoxyWizard", "Load a new file and lose changes?", "Yes", "No", 0, 0, 1 )) { case 0: @@ -278,7 +278,7 @@ void Wizard::quit() { if (hasChanged) { - switch( QMessageBox::warning( this, "DoxyWizard", "Quit and lose changes?\n", + switch( QMessageBox::warning( this, "DoxyWizard", "Quit and lose changes?", "Yes", "No", 0, 0, 1 )) { case 0: diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in index 5337781..d36db53 100644 --- a/addon/doxywizard/doxywizard.pro.in +++ b/addon/doxywizard/doxywizard.pro.in @@ -12,8 +12,7 @@ # project file for the doxywizard project # special template configuration file because we use flex -unix:TEMPLATE = app.t -win32:TEMPLATE = doxywizard.t +TEMPLATE = doxywizard.t # executable to generate TARGET = ../../bin/doxywizard @@ -29,8 +28,8 @@ HEADERS = doxywizard.h \ inputbool.h \ inputstrlist.h \ inputint.h \ - pixmaps.h -win32:HEADERS += config.h + pixmaps.h \ + config.h # source flle for the project SOURCES = doxywizard.cpp \ @@ -40,8 +39,8 @@ SOURCES = doxywizard.cpp \ inputbool.cpp \ inputstrlist.cpp \ inputint.cpp \ - pixmaps.cpp -win32:SOURCES += config.cpp + pixmaps.cpp \ + config.cpp # where to put the objects OBJECTS_DIR = obj @@ -57,5 +56,4 @@ win32:INCLUDEPATH += . # extra link options win32:TMAKE_LIBS = $(QTDIR)\lib\qtmain.lib $(QTDIR)\lib\qt-mt230nc.lib user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib win32:TMAKE_LIBS_QT = -unix:LIBS = -L../../lib -ldoxycfg |