From d56fa98fe74d75de1248389b3a1f1958a5a6fb90 Mon Sep 17 00:00:00 2001 From: benfry Date: Wed, 23 Jul 2003 22:42:05 +0000 Subject: [PATCH] removed references to Proce55ing (old naming), fixed up .cvsignore, Makefile now produces processing.exe --- processing/build/windows/launcher/.cvsignore | 14 ++------------ processing/build/windows/launcher/Makefile | 4 ++-- processing/build/windows/launcher/launcher.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/processing/build/windows/launcher/.cvsignore b/processing/build/windows/launcher/.cvsignore index 738a5cd6f..a3346cf0b 100644 --- a/processing/build/windows/launcher/.cvsignore +++ b/processing/build/windows/launcher/.cvsignore @@ -1,13 +1,3 @@ -Debug -Release -launcher.dsw -launcher.ncb -launcher.opt -launcher.plg -launcher.exe -launcher.ilk -launcher.aps -Proce55ing.ilk -Proce55ing.exe - +*.o +processing.exe diff --git a/processing/build/windows/launcher/Makefile b/processing/build/windows/launcher/Makefile index 987ad4d8b..41b67a25d 100644 --- a/processing/build/windows/launcher/Makefile +++ b/processing/build/windows/launcher/Makefile @@ -1,7 +1,7 @@ CXXFLAGS = -mwindows -mno-cygwin -O2 -Wall OBJS = launcher.o launcher-rc.o -launcher.exe: $(OBJS) +processing.exe: $(OBJS) $(LINK.cc) $(CXXFLAGS) -o $@ $(OBJS) $(OBJS): Makefile @@ -10,4 +10,4 @@ launcher-rc.o: launcher.rc windres -i $< -o $@ clean: - $(RM) $(OBJS) launcher.exe + $(RM) $(OBJS) processing.exe diff --git a/processing/build/windows/launcher/launcher.cpp b/processing/build/windows/launcher/launcher.cpp index 0427af220..6c325f465 100644 --- a/processing/build/windows/launcher/launcher.cpp +++ b/processing/build/windows/launcher/launcher.cpp @@ -72,7 +72,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) if (!SetEnvironmentVariable("CLASSPATH", cp)) { MessageBox(NULL, "Could not set CLASSPATH environment variable", - "Proce55ing Error", MB_OK); + "Processing Error", MB_OK); return 0; } @@ -108,7 +108,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) if (!ShellExecuteEx(&ShExecInfo)) { MessageBox(NULL, "Error calling ShellExecuteEx()", - "Proce55ing Error", MB_OK); + "Processing Error", MB_OK); return 0; } @@ -120,19 +120,19 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) case ERROR_PATH_NOT_FOUND: MessageBox(NULL, "A required file could not be found. \n" "You may need to install a Java runtime\n" - "or re-install Proce55ing.", - "Proce55ing Error", MB_OK); + "or re-install Processing.", + "Processing Error", MB_OK); break; case 0: case SE_ERR_OOM: MessageBox(NULL, "Not enough memory or resources to run at" - " this time.", "Proce55ing Error", MB_OK); + " this time.", "Processing Error", MB_OK); break; default: MessageBox(NULL, "There is a problem with your installation.\n" "If the problem persists, re-install the program.", - "Proce55ing Error", MB_OK); + "Processing Error", MB_OK); break; } }