diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-07-10 14:01:22 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-07-10 14:01:22 +0000 |
| commit | 4245442f8a1946ac5cd381926b8cb2f928eb2ed8 (patch) | |
| tree | 44afa72674f0e590bd372f826b44e81b14e2daaf /fluid | |
| parent | faf890868480b21c41a3309e66c0e1a9d87abe91 (diff) | |
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
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/ide_support.cxx | 2 | ||||
| -rw-r--r-- | fluid/ide_visualc.cxx | 11 |
2 files changed, 7 insertions, 6 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"); |