diff --git a/build/windows/dist/Proce55ing.exe b/build/windows/dist/Proce55ing.exe index f2c81a2ea..10dcb3ddd 100755 Binary files a/build/windows/dist/Proce55ing.exe and b/build/windows/dist/Proce55ing.exe differ diff --git a/build/windows/launcher/Makefile b/build/windows/launcher/Makefile new file mode 100644 index 000000000..987ad4d8b --- /dev/null +++ b/build/windows/launcher/Makefile @@ -0,0 +1,13 @@ +CXXFLAGS = -mwindows -mno-cygwin -O2 -Wall +OBJS = launcher.o launcher-rc.o + +launcher.exe: $(OBJS) + $(LINK.cc) $(CXXFLAGS) -o $@ $(OBJS) + +$(OBJS): Makefile + +launcher-rc.o: launcher.rc + windres -i $< -o $@ + +clean: + $(RM) $(OBJS) launcher.exe diff --git a/build/windows/launcher/StdAfx.cpp b/build/windows/launcher/StdAfx.cpp deleted file mode 100644 index d90e105d4..000000000 --- a/build/windows/launcher/StdAfx.cpp +++ /dev/null @@ -1,6 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// Launcher.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - diff --git a/build/windows/launcher/StdAfx.h b/build/windows/launcher/StdAfx.h deleted file mode 100644 index 1d322a865..000000000 --- a/build/windows/launcher/StdAfx.h +++ /dev/null @@ -1,25 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__12C4E5A8_27C5_11D2_BB54_006008DC2F94__INCLUDED_) -#define AFX_STDAFX_H__12C4E5A8_27C5_11D2_BB54_006008DC2F94__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers - -#include // MFC core and standard components -#include // MFC extensions -#ifndef _AFX_NO_AFXCMN_SUPPORT -#include // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT - - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__12C4E5A8_27C5_11D2_BB54_006008DC2F94__INCLUDED_) diff --git a/build/windows/launcher/launcher.cpp b/build/windows/launcher/launcher.cpp index a56a2e9de..0427af220 100644 --- a/build/windows/launcher/launcher.cpp +++ b/build/windows/launcher/launcher.cpp @@ -1,208 +1,141 @@ -// Launcher.cpp : Defines the class behaviors for the application. -// +// -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -#include "stdafx.h" -#include "launcher.h" +// launcher.cpp : Defines the class behaviors for the application. +// // The size of all of the strings was made sort of ambiguously large, since // 1) nothing is hurt by allocating an extra few bytes temporarily and // 2) if the user has a long path, and it gets copied five times over for the // classpath, the program runs the risk of crashing. Bad bad. -//#define STACKSIZE_ARGS "-mx60m -ms60m " -//#define STACKSIZE_MATCH " -mx" #define JAVA_ARGS "-Xms64m -Xmx64m " #define JAVA_MAIN_CLASS "PdeBase" -//#define JAVA_CLASS_PATH "lib;lib\\build;lib\\pde.jar;lib\\kjc.jar;lib\\oro.jar;lib\\ext\\comm.jar" -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#include +#include +#include -///////////////////////////////////////////////////////////////////////////// -// CLauncherApp - -BEGIN_MESSAGE_MAP(CLauncherApp, CWinApp) - //{{AFX_MSG_MAP(CLauncherApp) - // NOTE - the ClassWizard will add and remove mapping macros here. - // DO NOT EDIT what you see in these blocks of generated code! - //}}AFX_MSG - ON_COMMAND(ID_HELP, CWinApp::OnHelp) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CLauncherApp construction - -CLauncherApp::CLauncherApp() +int STDCALL +WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) { - // TODO: add construction code here, - // Place all significant initialization in InitInstance -} - -///////////////////////////////////////////////////////////////////////////// -// The one and only CLauncherApp object - -CLauncherApp theApp; - -///////////////////////////////////////////////////////////////////////////// -// CLauncherApp initialization - -BOOL CLauncherApp::InitInstance() -{ - // all these malloc statements... things may need to be larger. - - // what was passed to this application - char *incoming_cmdline = (char *)malloc(256 * sizeof(char)); - strcpy (incoming_cmdline, this->m_lpCmdLine); - - // what gets put together to pass to jre - char *outgoing_cmdline = (char *)malloc(16384 * sizeof(char)); - char *p = outgoing_cmdline; - - // prepend the args for -mx and -ms if they weren't - // specified on the command line by the user - /* - if (strstr(incoming_cmdline, STACKSIZE_MATCH)) { - // need to split stack args and documents - while (true) { - char c = *incoming_cmdline++; - if (c == ' ') { - if (*incoming_cmdline != '-') { - break; - } else { - *p++ = ' '; - } - } else if (c == 0) { - incoming_cmdline--; - *p++ = ' '; - break; - } else { - *p++ = c; - } - } - *p++ = 0; - } else { - strcpy(outgoing_cmdline, STACKSIZE_ARGS); - } - */ - strcpy(outgoing_cmdline, JAVA_ARGS); - - // append the classpath and launcher.Application - //char *cp = (char *)malloc(1024 * sizeof(char)); - char *loaddir = (char *)malloc(MAX_PATH * sizeof(char)); - *loaddir = 0; - - GetModuleFileName(NULL, loaddir, MAX_PATH); - // remove the application name - *(strrchr(loaddir, '\\')) = '\0'; - - char *cp = (char *)malloc(8 * strlen(loaddir) + 200); - // put quotes around contents of cp, - // because %s might have spaces in it. - - // test to see if running with a java runtime nearby or not - - char *testpath = (char *)malloc(MAX_PATH * sizeof(char)); - *testpath = 0; - strcpy(testpath, loaddir); - strcat(testpath, "\\java\\bin\\java.exe"); - FILE *fp = fopen(testpath, "rb"); - int localJreInstalled = (fp != NULL); - /* - if (fp == NULL) { - AfxMessageBox("no java runtime"); - } else { - AfxMessageBox("found java runtime"); - } - */ - - sprintf(cp, - "-cp \"" - "%s\\lib;" - "%s\\lib\\build;" - "%s\\lib\\pde.jar;" - "%s\\lib\\kjc.jar;" - "%s\\lib\\oro.jar;" - "%s\\lib\\comm.jar;" - "C:\\WINNT\\system32\\QTJava.zip;" - "C:\\WINDOWS\\system32\\QTJava.zip;" - "\" ", - loaddir, loaddir, loaddir, loaddir, loaddir, loaddir); - - //sprintf(cp, "-cp "); - //strcat(cp, JAVA_CLASSPATH); - //strcat(cp, " "); - strcat(outgoing_cmdline, cp); - //strcat(outgoing_cmdline, "-cp "); - //strcat(outgoing_cmdline, JAVA_CLASS_PATH); - //strcat(outgoing_cmdline, " "); - - // add the name of the class to execute - //strcat(outgoing_cmdline, "launcher.Application "); - strcat(outgoing_cmdline, JAVA_MAIN_CLASS); - strcat(outgoing_cmdline, " "); // space between next arg - - // append additional incoming stuff (document names), if any - strcat(outgoing_cmdline, incoming_cmdline); - - //AfxMessageBox(outgoing_cmdline); - - char *executable = (char *)malloc(256 * sizeof(char)); - // loaddir is the name path to the current application - - if (localJreInstalled) { - strcpy(executable, loaddir); - // copy in the path for jrew, relative to launcher.exe - //strcat(executable, "\\bin\\jrew"); - strcat(executable, "\\java\\bin\\javaw"); - } else { - strcpy(executable, "javaw"); - } - - //AfxMessageBox(executable); - - // code to add the lib directory to the path, in case that's needed - /* - char *path = (char *)malloc(1024 * sizeof(char)); - char *old_path = (char *)malloc(1024 * sizeof(char)); - strcpy(old_path, getenv("PATH")); - strcpy(path, "PATH="); - strcat(path, old_path); - strcat(path, ";"); - strcat(path, loaddir); - strcat(path, "\\lib"); - //AfxMessageBox(path); - putenv(path); - */ - - HINSTANCE result; - result = ShellExecute(NULL, "open", executable, - outgoing_cmdline, loaddir, SW_SHOWNORMAL); -// outgoing_cmdline, NULL, SW_SHOWNORMAL); - - if ((int)result <= 32) { - // some type of error occurred - switch ((int)result) { - case ERROR_FILE_NOT_FOUND: - case ERROR_PATH_NOT_FOUND: - AfxMessageBox("A required file could not be found. \n" - "You may need to install a Java runtime\n" - "or re-install Proce55ing."); - break; - case 0: - case SE_ERR_OOM: - AfxMessageBox("Not enough memory or resources to run at this time."); - break; - default: - AfxMessageBox("There is a problem with your installation.\n" - "If the problem persists, re-install the program."); - break; - } - } - - // Since the dialog has been closed, return FALSE so that we exit the - // application, rather than start the application's message pump. - return TRUE; + // all these malloc statements... things may need to be larger. + + // what was passed to this application + char *incoming_cmdline = (char *)malloc(256 * sizeof(char)); + strcpy (incoming_cmdline, lpCmd); + + // what gets put together to pass to jre + char *outgoing_cmdline = (char *)malloc(16384 * sizeof(char)); + + // prepend the args for -mx and -ms + strcpy(outgoing_cmdline, JAVA_ARGS); + + // append the classpath and launcher.Application + char *loaddir = (char *)malloc(MAX_PATH * sizeof(char)); + *loaddir = 0; + + GetModuleFileName(NULL, loaddir, MAX_PATH); + // remove the application name + *(strrchr(loaddir, '\\')) = '\0'; + + char *cp = (char *)malloc(8 * strlen(loaddir) + 200); + // put quotes around contents of cp, + // because %s might have spaces in it. + + // test to see if running with a java runtime nearby or not + + char *testpath = (char *)malloc(MAX_PATH * sizeof(char)); + *testpath = 0; + strcpy(testpath, loaddir); + strcat(testpath, "\\java\\bin\\java.exe"); + FILE *fp = fopen(testpath, "rb"); + int localJreInstalled = (fp != NULL); + + const char *envClasspath = getenv("CLASSPATH"); + sprintf(cp, + "%s" + "%s" + "%s" + "%s\\lib;" + "%s\\lib\\build;" + "%s\\lib\\pde.jar;" + "%s\\lib\\kjc.jar;" + "%s\\lib\\oro.jar;" + "%s\\lib\\comm.jar;" + "C:\\WINNT\\system32\\QTJava.zip;" + "C:\\WINDOWS\\system32\\QTJava.zip;" + "\" ", + localJreInstalled ? "java\\lib\\rt.jar;" : "", + envClasspath ? envClasspath : "", + envClasspath ? ";" : "", + loaddir, loaddir, loaddir, loaddir, loaddir, loaddir); + + if (!SetEnvironmentVariable("CLASSPATH", cp)) { + MessageBox(NULL, "Could not set CLASSPATH environment variable", + "Proce55ing Error", MB_OK); + return 0; + } + + // add the name of the class to execute and a space before the next arg + strcat(outgoing_cmdline, JAVA_MAIN_CLASS " "); + + // append additional incoming stuff (document names), if any + strcat(outgoing_cmdline, incoming_cmdline); + + char *executable = (char *)malloc(256 * sizeof(char)); + // loaddir is the name path to the current application + + if (localJreInstalled) { + strcpy(executable, loaddir); + // copy in the path for javaw, relative to launcher.exe + strcat(executable, "\\java\\bin\\javaw.exe"); + } else { + strcpy(executable, "javaw.exe"); + } + + SHELLEXECUTEINFO ShExecInfo; + + // set up the execution info + ShExecInfo.cbSize = sizeof(SHELLEXECUTEINFO); + ShExecInfo.fMask = 0; + ShExecInfo.hwnd = 0; + ShExecInfo.lpVerb = "open"; + ShExecInfo.lpFile = executable; + ShExecInfo.lpParameters = outgoing_cmdline; + ShExecInfo.lpDirectory = loaddir; + ShExecInfo.nShow = SW_SHOWNORMAL; + ShExecInfo.hInstApp = NULL; + + if (!ShellExecuteEx(&ShExecInfo)) { + MessageBox(NULL, "Error calling ShellExecuteEx()", + "Proce55ing Error", MB_OK); + return 0; + } + + if (reinterpret_cast(ShExecInfo.hInstApp) <= 32) { + + // some type of error occurred + switch (reinterpret_cast(ShExecInfo.hInstApp)) { + case ERROR_FILE_NOT_FOUND: + 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); + break; + case 0: + case SE_ERR_OOM: + MessageBox(NULL, "Not enough memory or resources to run at" + " this time.", "Proce55ing 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); + break; + } + } + + return 0; } diff --git a/build/windows/launcher/launcher.dsp b/build/windows/launcher/launcher.dsp deleted file mode 100644 index c84e59404..000000000 --- a/build/windows/launcher/launcher.dsp +++ /dev/null @@ -1,140 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Launcher" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Launcher - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "launcher.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "launcher.mak" CFG="Launcher - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Launcher - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Launcher - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Launcher - Win32 Release" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 5 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 /nologo /subsystem:windows /machine:I386 /out:"Release/Proce55ing.exe" - -!ELSEIF "$(CFG)" == "Launcher - Win32 Debug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /FR /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/Proce55ing.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Launcher - Win32 Release" -# Name "Launcher - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\launcher.cpp -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\launcher.h -# End Source File -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\application.ico -# End Source File -# Begin Source File - -SOURCE=.\document.ico -# End Source File -# Begin Source File - -SOURCE=.\launcher.rc -# End Source File -# Begin Source File - -SOURCE=.\resources.rc2 -# End Source File -# End Group -# End Target -# End Project diff --git a/build/windows/launcher/launcher.h b/build/windows/launcher/launcher.h deleted file mode 100644 index 69800c88e..000000000 --- a/build/windows/launcher/launcher.h +++ /dev/null @@ -1,55 +0,0 @@ -// launcher.h : main header file for the LAUNCHER application -// - -#if !defined(AFX_LAUNCHER_H__12C4E5A4_27C5_11D2_BB54_006008DC2F94__INCLUDED_) -#define AFX_LAUNCHER_H__12C4E5A4_27C5_11D2_BB54_006008DC2F94__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#ifndef __AFXWIN_H__ - #error include 'stdafx.h' before including this file for PCH -#endif - -#include "resource.h" // main symbols - -extern "C" { - int java_main(int argc, char *argv[]); -} - -///////////////////////////////////////////////////////////////////////////// -// CLauncherApp: -// See Launcher.cpp for the implementation of this class -// - -class CLauncherApp : public CWinApp -{ -public: - CLauncherApp(); - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CLauncherApp) - public: - virtual BOOL InitInstance(); - //}}AFX_VIRTUAL - - void CLauncherApp::buildClassPath(char*); - -// Implementation - - //{{AFX_MSG(CLauncherApp) - // NOTE - the ClassWizard will add and remove member functions here. - // DO NOT EDIT what you see in these blocks of generated code ! - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_LAUNCHER_H__12C4E5A4_27C5_11D2_BB54_006008DC2F94__INCLUDED_) diff --git a/build/windows/launcher/launcher.rc b/build/windows/launcher/launcher.rc index 9647a4804..f44c3890d 100644 --- a/build/windows/launcher/launcher.rc +++ b/build/windows/launcher/launcher.rc @@ -1,91 +1,19 @@ -//Microsoft Developer Studio generated resource script. +//Originally a Microsoft Developer Studio generated resource script. // -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "#define _AFX_NO_SPLITTER_RESOURCES\r\n" - "#define _AFX_NO_OLE_RESOURCES\r\n" - "#define _AFX_NO_TRACKER_RESOURCES\r\n" - "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#endif\r\n" - "#include ""resources.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#endif\0" -END - -#endif // APSTUDIO_INVOKED - ///////////////////////////////////////////////////////////////////////////// // // Icon // +#define IDR_MAINFRAME 128 +#define IDR_DOCUMENT 129 // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDR_MAINFRAME ICON DISCARDABLE "application.ico" IDR_DOCUMENT ICON DISCARDABLE "document.ico" -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_IMAGER_DIALOG DIALOGEX 0, 0, 185, 92 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_APPWINDOW -CAPTION "Launcher" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,128,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,128,23,50,14 - LTEXT "TODO: Place dialog controls here.",IDC_STATIC,5,34,113, - 8 -END - - +// not sure what triggers _MAC to be defined #ifndef _MAC ///////////////////////////////////////////////////////////////////////////// // @@ -129,47 +57,4 @@ END #endif // !_MAC -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_IMAGER_DIALOG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 178 - TOPMARGIN, 7 - BOTTOMMARGIN, 85 - END -END -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#define _AFX_NO_SPLITTER_RESOURCES -#define _AFX_NO_OLE_RESOURCES -#define _AFX_NO_TRACKER_RESOURCES -#define _AFX_NO_PROPERTY_RESOURCES - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE 9, 1 -#pragma code_page(1252) -#endif -#include "resources.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#endif -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED diff --git a/build/windows/launcher/resource.h b/build/windows/launcher/resource.h deleted file mode 100644 index 340d1b525..000000000 --- a/build/windows/launcher/resource.h +++ /dev/null @@ -1,18 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by launcher.rc -// -#define IDD_IMAGER_DIALOG 102 -#define IDR_MAINFRAME 128 -#define IDR_DOCUMENT 129 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 130 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/build/windows/launcher/resources.rc2 b/build/windows/launcher/resources.rc2 deleted file mode 100644 index 8957efefd..000000000 --- a/build/windows/launcher/resources.rc2 +++ /dev/null @@ -1,13 +0,0 @@ -// -// IMAGER.RC2 - resources Microsoft Visual C++ does not edit directly -// - -#ifdef APSTUDIO_INVOKED - #error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// Add manually edited resources here... - -/////////////////////////////////////////////////////////////////////////////