From 4245442f8a1946ac5cd381926b8cb2f928eb2ed8 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 10 Jul 2010 14:01:22 +0000 Subject: Applied Greg's patch to fluid (STR #2393) to prevent false error messages when building .cxx and .h files from .fl files. Updated the ide/VisualC6 project files, tested and built w/o errors with Visual C++ 2008 Express (84 projects successful). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7674 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/ide_support.cxx | 2 +- fluid/ide_visualc.cxx | 11 ++++++----- ide/VisualC6/CubeView.dsp | 8 ++++---- ide/VisualC6/fast_slow.dsp | 8 ++++---- ide/VisualC6/inactive.dsp | 8 ++++---- ide/VisualC6/keyboard.dsp | 8 ++++---- ide/VisualC6/mandelbrot.dsp | 8 ++++---- ide/VisualC6/preferences.dsp | 8 ++++---- ide/VisualC6/radio.dsp | 8 ++++---- ide/VisualC6/resize.dsp | 8 ++++---- ide/VisualC6/tabs.dsp | 8 ++++---- ide/VisualC6/tree.dsp | 8 ++++---- ide/VisualC6/valuators.dsp | 8 ++++---- 13 files changed, 51 insertions(+), 50 deletions(-) diff --git a/fluid/ide_support.cxx b/fluid/ide_support.cxx index ea3dd0d57..b88d32002 100644 --- a/fluid/ide_support.cxx +++ b/fluid/ide_support.cxx @@ -1361,7 +1361,7 @@ public: int arg(int argc, char **argv, int &i) { if (argc>=i+1 && strcmp(argv[i], "--fltkdb")==0) { if (argc>=i+2 && argv[i+1][0]!='-') { - fprintf(stderr, "Creating Databse %s\n", argv[i+1]); + fprintf(stderr, "Creating Database %s\n", argv[i+1]); exit_early = 1; create_new_database(argv[i+1]); i = i+2; diff --git a/fluid/ide_visualc.cxx b/fluid/ide_visualc.cxx index c399c6f26..5faa7653b 100644 --- a/fluid/ide_visualc.cxx +++ b/fluid/ide_visualc.cxx @@ -197,10 +197,11 @@ public: int writeFluidFile(FILE *f, Fl_File_Prefs &fileDB, const char *name) { char pathAndName[1024]; fileDB.get("pathAndName", pathAndName, "DBERROR/DBERROR.DBERR", 1024); char cxx_pathname[1024]; strcpy(cxx_pathname, pathAndName); + char path_fl[1024]; strcpy(path_fl, fileDB.filePath()); DOSPath(pathAndName); fl_filename_setext(cxx_pathname, 1024, ".cxx"); DOSPath(cxx_pathname); - const char *path_fl = fileDB.filePath(); + DOSPath(path_fl); fprintf(f, "# Begin Source File\r\n"); fprintf(f, "\r\n"); fprintf(f, "SOURCE=..\\..\\%s\r\n", cxx_pathname); @@ -215,9 +216,9 @@ public: fprintf(f, "InputPath=..\\..\\%s\r\n", pathAndName); fprintf(f, "\r\n"); fprintf(f, "\"..\\..\\%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", cxx_pathname); - fprintf(f, "\tcd ..\\..\\%s \r\n", path_fl); + fprintf(f, "\tpushd ..\\..\\%s \r\n", path_fl); fprintf(f, "\t..\\fluid\\fluid -c %s\r\n", fileDB.fullName()); - fprintf(f, "\tcd ..\\ide\\visualc \r\n"); + fprintf(f, "\tpopd \r\n"); fprintf(f, "\t\r\n"); fprintf(f, "# End Custom Build\r\n"); fprintf(f, "\r\n"); @@ -227,9 +228,9 @@ public: fprintf(f, "InputPath=..\\..\\%s\r\n", pathAndName); fprintf(f, "\r\n"); fprintf(f, "\"..\\..\\%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", cxx_pathname); - fprintf(f, "\tcd ..\\..\\%s \r\n", path_fl); + fprintf(f, "\tpushd ..\\..\\%s \r\n", path_fl); fprintf(f, "\t..\\fluid\\fluidd -c %s \r\n", fileDB.fullName()); - fprintf(f, "\tcd ..\\ide\\visualc \r\n"); + fprintf(f, "\tpopd \r\n"); fprintf(f, "\t\r\n"); fprintf(f, "# End Custom Build\r\n"); fprintf(f, "\r\n"); diff --git a/ide/VisualC6/CubeView.dsp b/ide/VisualC6/CubeView.dsp index 68bbe7506..12dfa3c37 100644 --- a/ide/VisualC6/CubeView.dsp +++ b/ide/VisualC6/CubeView.dsp @@ -111,9 +111,9 @@ SOURCE=..\..\test\CubeViewUI.fl InputPath=..\..\test\CubeViewUI.fl "..\..\test\CubeViewUI.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluid -c CubeViewUI.fl - cd ..\ide\visualc + popd # End Custom Build @@ -123,9 +123,9 @@ InputPath=..\..\test\CubeViewUI.fl InputPath=..\..\test\CubeViewUI.fl "..\..\test\CubeViewUI.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluidd -c CubeViewUI.fl - cd ..\ide\visualc + popd # End Custom Build diff --git a/ide/VisualC6/fast_slow.dsp b/ide/VisualC6/fast_slow.dsp index 31dc7299d..44a9374c1 100644 --- a/ide/VisualC6/fast_slow.dsp +++ b/ide/VisualC6/fast_slow.dsp @@ -103,9 +103,9 @@ SOURCE=..\..\test\fast_slow.fl InputPath=..\..\test\fast_slow.fl "..\..\test\fast_slow.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluid -c fast_slow.fl - cd ..\ide\visualc + popd # End Custom Build @@ -115,9 +115,9 @@ InputPath=..\..\test\fast_slow.fl InputPath=..\..\test\fast_slow.fl "..\..\test\fast_slow.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluidd -c fast_slow.fl - cd ..\ide\visualc + popd # End Custom Build diff --git a/ide/VisualC6/inactive.dsp b/ide/VisualC6/inactive.dsp index fc7eeee50..c90281de6 100644 --- a/ide/VisualC6/inactive.dsp +++ b/ide/VisualC6/inactive.dsp @@ -103,9 +103,9 @@ SOURCE=..\..\test\inactive.fl InputPath=..\..\test\inactive.fl "..\..\test\inactive.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluid -c inactive.fl - cd ..\ide\visualc + popd # End Custom Build @@ -115,9 +115,9 @@ InputPath=..\..\test\inactive.fl InputPath=..\..\test\inactive.fl "..\..\test\inactive.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluidd -c inactive.fl - cd ..\ide\visualc + popd # End Custom Build diff --git a/ide/VisualC6/keyboard.dsp b/ide/VisualC6/keyboard.dsp index 67b4e9538..6216d5149 100644 --- a/ide/VisualC6/keyboard.dsp +++ b/ide/VisualC6/keyboard.dsp @@ -107,9 +107,9 @@ SOURCE=..\..\test\keyboard_ui.fl InputPath=..\..\test\keyboard_ui.fl "..\..\test\keyboard_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluid -c keyboard_ui.fl - cd ..\ide\visualc + popd # End Custom Build @@ -119,9 +119,9 @@ InputPath=..\..\test\keyboard_ui.fl InputPath=..\..\test\keyboard_ui.fl "..\..\test\keyboard_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluidd -c keyboard_ui.fl - cd ..\ide\visualc + popd # End Custom Build diff --git a/ide/VisualC6/mandelbrot.dsp b/ide/VisualC6/mandelbrot.dsp index 84f57247f..f3c4e3b8f 100644 --- a/ide/VisualC6/mandelbrot.dsp +++ b/ide/VisualC6/mandelbrot.dsp @@ -107,9 +107,9 @@ SOURCE=..\..\test\mandelbrot_ui.fl InputPath=..\..\test\mandelbrot_ui.fl "..\..\test\mandelbrot_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluid -c mandelbrot_ui.fl - cd ..\ide\visualc + popd # End Custom Build @@ -119,9 +119,9 @@ InputPath=..\..\test\mandelbrot_ui.fl InputPath=..\..\test\mandelbrot_ui.fl "..\..\test\mandelbrot_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluidd -c mandelbrot_ui.fl - cd ..\ide\visualc + popd # End Custom Build diff --git a/ide/VisualC6/preferences.dsp b/ide/VisualC6/preferences.dsp index fa8c77e82..3733743b2 100644 --- a/ide/VisualC6/preferences.dsp +++ b/ide/VisualC6/preferences.dsp @@ -103,9 +103,9 @@ SOURCE=..\..\test\preferences.fl InputPath=..\..\test\preferences.fl "..\..\test\preferences.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluid -c preferences.fl - cd ..\ide\visualc + popd # End Custom Build @@ -115,9 +115,9 @@ InputPath=..\..\test\preferences.fl InputPath=..\..\test\preferences.fl "..\..\test\preferences.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluidd -c preferences.fl - cd ..\ide\visualc + popd # End Custom Build diff --git a/ide/VisualC6/radio.dsp b/ide/VisualC6/radio.dsp index 752fcd734..d93cb3ee1 100644 --- a/ide/VisualC6/radio.dsp +++ b/ide/VisualC6/radio.dsp @@ -103,9 +103,9 @@ SOURCE=..\..\test\radio.fl InputPath=..\..\test\radio.fl "..\..\test\radio.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluid -c radio.fl - cd ..\ide\visualc + popd # End Custom Build @@ -115,9 +115,9 @@ InputPath=..\..\test\radio.fl InputPath=..\..\test\radio.fl "..\..\test\radio.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluidd -c radio.fl - cd ..\ide\visualc + popd # End Custom Build diff --git a/ide/VisualC6/resize.dsp b/ide/VisualC6/resize.dsp index 6742e8936..35985bce8 100644 --- a/ide/VisualC6/resize.dsp +++ b/ide/VisualC6/resize.dsp @@ -103,9 +103,9 @@ SOURCE=..\..\test\resize.fl InputPath=..\..\test\resize.fl "..\..\test\resize.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluid -c resize.fl - cd ..\ide\visualc + popd # End Custom Build @@ -115,9 +115,9 @@ InputPath=..\..\test\resize.fl InputPath=..\..\test\resize.fl "..\..\test\resize.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluidd -c resize.fl - cd ..\ide\visualc + popd # End Custom Build diff --git a/ide/VisualC6/tabs.dsp b/ide/VisualC6/tabs.dsp index ba6e9fb42..b38bb2cd4 100644 --- a/ide/VisualC6/tabs.dsp +++ b/ide/VisualC6/tabs.dsp @@ -103,9 +103,9 @@ SOURCE=..\..\test\tabs.fl InputPath=..\..\test\tabs.fl "..\..\test\tabs.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluid -c tabs.fl - cd ..\ide\visualc + popd # End Custom Build @@ -115,9 +115,9 @@ InputPath=..\..\test\tabs.fl InputPath=..\..\test\tabs.fl "..\..\test\tabs.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluidd -c tabs.fl - cd ..\ide\visualc + popd # End Custom Build diff --git a/ide/VisualC6/tree.dsp b/ide/VisualC6/tree.dsp index eab7cb60f..64cea79cd 100644 --- a/ide/VisualC6/tree.dsp +++ b/ide/VisualC6/tree.dsp @@ -103,9 +103,9 @@ SOURCE=..\..\test\tree.fl InputPath=..\..\test\tree.fl "..\..\test\tree.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluid -c tree.fl - cd ..\ide\visualc + popd # End Custom Build @@ -115,9 +115,9 @@ InputPath=..\..\test\tree.fl InputPath=..\..\test\tree.fl "..\..\test\tree.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluidd -c tree.fl - cd ..\ide\visualc + popd # End Custom Build diff --git a/ide/VisualC6/valuators.dsp b/ide/VisualC6/valuators.dsp index 1a0a25cc6..2e6563856 100644 --- a/ide/VisualC6/valuators.dsp +++ b/ide/VisualC6/valuators.dsp @@ -103,9 +103,9 @@ SOURCE=..\..\test\valuators.fl InputPath=..\..\test\valuators.fl "..\..\test\valuators.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluid -c valuators.fl - cd ..\ide\visualc + popd # End Custom Build @@ -115,9 +115,9 @@ InputPath=..\..\test\valuators.fl InputPath=..\..\test\valuators.fl "..\..\test\valuators.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\..\test/ + pushd ..\..\test\ ..\fluid\fluidd -c valuators.fl - cd ..\ide\visualc + popd # End Custom Build -- cgit v1.2.3