forked from 0ad/0ad
no message
This was SVN commit r45.
This commit is contained in:
parent
09031a412b
commit
6b1d9ce43f
@ -15,6 +15,8 @@
|
||||
#include "vfs.h"
|
||||
#include "ia32.h"
|
||||
|
||||
#include "ps/cstr.h"
|
||||
|
||||
#ifndef NO_GUI
|
||||
#include "gui/GUI.h"
|
||||
#endif
|
||||
@ -81,7 +83,7 @@ static void write_sys_info()
|
||||
|
||||
#ifdef _WIN32
|
||||
#define MB_ICONEXCLAMATION 0x30
|
||||
IMP(u32, MessageBoxA, (void*, const char*, const char*, unsigned int))
|
||||
IMP(int, MessageBoxA, (void*, const char*, const char*, unsigned int))
|
||||
#endif
|
||||
|
||||
// error before GUI is initialized: display message, and quit
|
||||
@ -226,6 +228,11 @@ static void do_tick()
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
CStr mycstr = _T("string");
|
||||
if(mycstr == _T("string"))
|
||||
exit(1);
|
||||
|
||||
|
||||
// set 24 bit (float) FPU precision for faster divides / sqrts
|
||||
#ifdef _M_IX86
|
||||
_control87(_PC_24, _MCW_PC);
|
||||
|
||||
@ -35,8 +35,6 @@ More Info:
|
||||
#include "Prometheus.h"
|
||||
#include <string> // Used for basic string functionality
|
||||
#include <iostream>
|
||||
#include "win.h" // REMOVEME
|
||||
#include <TCHAR.h> // TCHAR of course
|
||||
#include <cstdlib>
|
||||
using namespace std;
|
||||
|
||||
@ -48,12 +46,17 @@ using namespace std;
|
||||
typedef wstring tstring;
|
||||
#define _tcout wcout
|
||||
#define _tstod wcstod
|
||||
typedef wchar_t TCHAR;
|
||||
#define _T(t) L ## t
|
||||
#else
|
||||
typedef string tstring;
|
||||
#define _tcout cout
|
||||
#define _tstod strtod
|
||||
typedef char TCHAR;
|
||||
#define _T(t) t
|
||||
#endif
|
||||
|
||||
|
||||
enum PS_TRIM_MODE {PS_TRIM_LEFT, PS_TRIM_RIGHT, PS_TRIM_BOTH};
|
||||
|
||||
|
||||
@ -67,7 +70,7 @@ public:
|
||||
CStr(const CStr &Str); // Copy Constructor
|
||||
|
||||
CStr(tstring String); // Creates CStr from C++ string
|
||||
CStr(LPCTSTR String); // Creates CStr from C-Style TCHAR string
|
||||
CStr(const TCHAR* String); // Creates CStr from C-Style TCHAR string
|
||||
CStr(TCHAR Char); // Creates CStr from a TCHAR
|
||||
CStr(_int Number); // Creates CStr from a int
|
||||
CStr(_uint Number); // Creates CStr from a uint
|
||||
@ -120,7 +123,7 @@ public:
|
||||
|
||||
// Overload operations
|
||||
CStr &operator=(const CStr &Str);
|
||||
CStr &operator=(LPCTSTR String);
|
||||
CStr &operator=(const TCHAR* String);
|
||||
CStr &operator=(TCHAR Char);
|
||||
CStr &operator=(_int Number);
|
||||
CStr &operator=(_long Number);
|
||||
@ -137,7 +140,7 @@ public:
|
||||
_bool operator>=(const CStr &Str) const;
|
||||
CStr &operator+=(CStr &Str);
|
||||
CStr operator+(CStr &Str);
|
||||
operator LPCTSTR();
|
||||
operator const TCHAR*();
|
||||
TCHAR &operator[](_int n);
|
||||
TCHAR &operator[](_uint n);
|
||||
TCHAR &operator[](_long n);
|
||||
|
||||
@ -43,7 +43,7 @@ RSC=rc.exe
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NO_GUI" /YX /FD /c
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x407 /d "NDEBUG"
|
||||
@ -53,7 +53,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /entry:"entry" /subsystem:windows /pdb:"..\..\binaries/ps.pdb" /machine:I386 /out:"..\..\binaries\ps.exe"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /entry:"entry" /subsystem:windows /pdb:"..\..\binaries/ps.vc6.pdb" /machine:I386 /out:"..\..\binaries\ps.vc6.exe"
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "ps - Win32 Debug"
|
||||
@ -70,7 +70,7 @@ LINK32=link.exe
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
|
||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NO_GUI" /FD /GZ /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
@ -81,7 +81,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /entry:"entry" /subsystem:windows /pdb:"..\..\binaries/ps_dbg.pdb" /debug /machine:I386 /out:"..\..\binaries\ps_dbg.exe" /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /entry:"entry" /subsystem:windows /pdb:"..\..\binaries/ps_dbg.vc6.pdb" /debug /machine:I386 /out:"..\..\binaries\ps_dbg.vc6.exe" /pdbtype:sept
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ENDIF
|
||||
@ -185,82 +185,6 @@ SOURCE=..\terrain\Vector3D.h
|
||||
# Begin Group "gui"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CButton.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CButton.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CGUI.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CGUI.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CGUIButtonBehavior.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CGUIButtonBehavior.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CGUIObject.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CGUIObject.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CGUISettingsObject.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CGUISettingsObject.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CGUISprite.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\CGUISprite.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\GUI.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\GUIbase.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\GUIbase.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\GUIutil.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\GUIutil.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\XercesErrorHandler.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\gui\XercesErrorHandler.h
|
||||
# End Source File
|
||||
# End Group
|
||||
# Begin Group "lib"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user