- Frag fully builds.

- Unfrag fails to link (both are still excluded from the build process).

svn path=/trunk/; revision=33051
This commit is contained in:
Aleksey Bragin 2008-04-20 09:23:29 +00:00
parent 28c134ec41
commit a0f475f608
4 changed files with 9 additions and 9 deletions

View file

@ -20,7 +20,10 @@ HINSTANCE GlobalHInstance = NULL;
Defragment *Defrag = NULL;
INT WINAPI
wWinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPCWSTR CmdLine, INT ShowCmd)
wWinMain(HINSTANCE HInstance,
HINSTANCE hPrev,
LPWSTR Cmd,
int iCmd)
{
INITCOMMONCONTROLSEX InitControls;

View file

@ -13,13 +13,13 @@
#include <commctrl.h>
int WINAPI WinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPSTR CmdLine, int ShowCmd);
//int WINAPI WinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPSTR CmdLine, int ShowCmd);
Defragment *StartDefragBox (wstring Drive, DefragType Method);
extern HINSTANCE GlobalHInstance;
extern Defragment *Defrag;
extern INT PASCAL wWinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPCWSTR CmdLine, INT ShowCmd);
//extern INT PASCAL wWinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPCWSTR CmdLine, INT ShowCmd);
#endif // FRAGINATOR_H

View file

@ -28,10 +28,10 @@
#endif
#endif
#include <windows.h>
#include <string>
#include <stdio.h>
#include <stdlib.h>
#include <windows.h>
#include <string>
//#include <initguid.h>
#include <winioctl.h>

View file

@ -1,8 +1,7 @@
<?xml version="1.0"?>
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
<module name="frag" type="win32gui" installbase="system32" installname="frag.exe" unicode="yes">
<include base="frag">.</include>
<define name="__USE_W32API" />
<define name="WINVER">0x0501</define>
<define name="_WIN32_IE">0x0600</define>
<library>kernel32</library>
@ -20,7 +19,6 @@
<module name="unfrag" type="win32cui" installbase="system32" installname="unfrag.exe" unicode="yes">
<include base="unfrag">.</include>
<define name="__USE_W32API" />
<define name="WINVER">0x0501</define>
<define name="_WIN32_IE">0x0600</define>
<library>kernel32</library>
@ -30,4 +28,3 @@
<file>Defragment.cpp</file>
<file>DriveVolume.cpp</file>
</module>
</group>