mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied Greg's patch to fluid (STR #2393) to prevent false error

Browse Source 
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
This commit is contained in:
Albrecht Schlosser 2010-07-10 14:01:22 +00:00
parent faf8908684
commit 4245442f8a
13 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fluid/ide_support.cxx
View File

@ -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;

11
fluid/ide_visualc.cxx
View File

@ -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");

8
ide/VisualC6/CubeView.dsp
View File

@ -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

8
ide/VisualC6/fast_slow.dsp
View File

@ -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

8
ide/VisualC6/inactive.dsp
View File

@ -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

8
ide/VisualC6/keyboard.dsp
View File

@ -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

8
ide/VisualC6/mandelbrot.dsp
View File

@ -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

8
ide/VisualC6/preferences.dsp
View File

@ -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

8
ide/VisualC6/radio.dsp
View File

@ -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

8
ide/VisualC6/resize.dsp
View File

@ -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

8
ide/VisualC6/tabs.dsp
View File

@ -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

8
ide/VisualC6/tree.dsp
View File

@ -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

8
ide/VisualC6/valuators.dsp
View File

@ -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