Revision: 2554
http://emerge.svn.sourceforge.net/emerge/?rev=2554&view=rev
Author: ir0nh34d
Date: 2009-08-13 01:24:04 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
Updated to support latest build settings
Modified Paths:
--------------
trunk/Source/EmergeDesktop.cbp
Modified: trunk/Source/EmergeDesktop.cbp
===================================================================
--- trunk/Source/EmergeDesktop.cbp 2009-08-13 01:23:16 UTC (rev 2553)
+++ trunk/Source/EmergeDesktop.cbp 2009-08-13 01:24:04 UTC (rev 2554)
@@ -34,6 +34,7 @@
<Add library="gdi32" />
<Add library="wtsapi32" />
<Add library="winmm" />
+ <Add library="powrprof" />
</Linker>
</Target>
<Target title="emergeGraphics - Release">
@@ -213,6 +214,7 @@
<Add library="emergeAppletEngine" />
<Add library="ole32" />
<Add library="uuid" />
+ <Add library="emergeBaseClasses" />
<Add directory=".\bin" />
</Linker>
</Target>
@@ -286,6 +288,7 @@
<Add library="emergeAppletEngine" />
<Add library="emergeGraphics" />
<Add library="emergeBaseClasses" />
+ <Add library="comctl32" />
<Add directory=".\bin" />
</Linker>
</Target>
@@ -431,6 +434,26 @@
<Add directory=".\bin" />
</Linker>
</Target>
+ <Target title="reg2xml - Release">
+ <Option platforms="Windows;" />
+ <Option output="bin\reg2xml" prefix_auto="1" extension_auto="1" />
+ <Option object_output=".objs\Release" />
+ <Option external_deps="bin\emergeLib.dll;" />
+ <Option type="0" />
+ <Option compiler="gcc" />
+ <Compiler>
+ <Add option="-march=i686" />
+ <Add option="-O2" />
+ </Compiler>
+ <Linker>
+ <Add option="-s" />
+ <Add library="emergeLib" />
+ <Add library="emergeBaseClasses" />
+ <Add library="shlwapi" />
+ <Add library="comctl32" />
+ <Add directory=".\bin" />
+ </Linker>
+ </Target>
<Target title="emergeAppletEngine - Debug">
<Option platforms="Windows;" />
<Option output="bin\emergeAppletEngine" prefix_auto="1" extension_auto="1" />
@@ -532,7 +555,7 @@
</Environment>
</Build>
<VirtualTargets>
- <Add alias="All - Release" targets="emergeLib - Release;emergeGraphics - Release;emergeAppletEngine - Release;emergeSchemeEngine - Release;emergeBaseClasses - Release;emergeCore - Release;emergeCommand - Release;emergeDesktop - Release;emergeHotkeys - Release;emergeLauncher - Release;emergeTasks - Release;emergeTray - Release;emergeVWM - Release;emerge - Release;emergePower - Release;emergeSysMon - Release;" />
+ <Add alias="All - Release" targets="emergeLib - Release;emergeGraphics - Release;emergeAppletEngine - Release;emergeSchemeEngine - Release;emergeBaseClasses - Release;emergeCore - Release;emergeCommand - Release;emergeDesktop - Release;emergeHotkeys - Release;emergeLauncher - Release;emergeTasks - Release;emergeTray - Release;emergeVWM - Release;emerge - Release;emergePower - Release;reg2xml - Release;" />
</VirtualTargets>
<Compiler>
<Add option="-pedantic" />
@@ -574,32 +597,21 @@
<Unit filename="emergeBaseClasses\BaseAppletMenu.h">
<Option target="emergeBaseClasses - Release" />
</Unit>
- <Unit filename="emergeBaseClasses\BaseSettings.cpp">
+ <Unit filename="emergeBaseClasses\BasePositionPage.cpp">
<Option target="emergeBaseClasses - Release" />
</Unit>
- <Unit filename="emergeBaseClasses\BaseSettings.h">
+ <Unit filename="emergeBaseClasses\BasePositionPage.dlg">
<Option target="emergeBaseClasses - Release" />
</Unit>
- <Unit filename="emergeBaseClasses\emergeBaseClasses-w64.dll.manifest">
- <Option target="emergeLib - Release" />
- <Option target="emergeGraphics - Release" />
- <Option target="emergeAppletEngine - Release" />
- <Option target="emergeSchemeEngine - Release" />
+ <Unit filename="emergeBaseClasses\BasePositionPage.h">
<Option target="emergeBaseClasses - Release" />
- <Option target="emergeCore - Release" />
- <Option target="emergeCommand - Release" />
- <Option target="emergeDesktop - Release" />
- <Option target="emergeHotkeys - Release" />
- <Option target="emergeLauncher - Release" />
- <Option target="emergeTasks - Release" />
- <Option target="emergeTray - Release" />
- <Option target="emergeVWM - Release" />
- <Option target="emerge - Release" />
- <Option target="emergeAppletEngine - Debug" />
- <Option target="emergeDesktop - Debug" />
- <Option target="emergeCore - Debug" />
- <Option target="emergeCommand - Debug" />
</Unit>
+ <Unit filename="emergeBaseClasses\BaseSettings.cpp">
+ <Option target="emergeBaseClasses - Release" />
+ </Unit>
+ <Unit filename="emergeBaseClasses\BaseSettings.h">
+ <Option target="emergeBaseClasses - Release" />
+ </Unit>
<Unit filename="emergeBaseClasses\emergeBaseClasses.dll.manifest">
<Option target="emergeBaseClasses - Release" />
</Unit>
@@ -650,26 +662,6 @@
<Option target="emergeCommand - Release" />
<Option target="emergeCommand - Debug" />
</Unit>
- <Unit filename="emergeCommand\emergeCommand-w64.exe.manifest">
- <Option target="emergeLib - Release" />
- <Option target="emergeGraphics - Release" />
- <Option target="emergeAppletEngine - Release" />
- <Option target="emergeSchemeEngine - Release" />
- <Option target="emergeBaseClasses - Release" />
- <Option target="emergeCore - Release" />
- <Option target="emergeCommand - Release" />
- <Option target="emergeDesktop - Release" />
- <Option target="emergeHotkeys - Release" />
- <Option target="emergeLauncher - Release" />
- <Option target="emergeTasks - Release" />
- <Option target="emergeTray - Release" />
- <Option target="emergeVWM - Release" />
- <Option target="emerge - Release" />
- <Option target="emergeAppletEngine - Debug" />
- <Option target="emergeDesktop - Debug" />
- <Option target="emergeCore - Debug" />
- <Option target="emergeCommand - Debug" />
- </Unit>
<Unit filename="emergeCommand\emergeCommand.exe.manifest">
<Option target="emergeCommand - Release" />
<Option target="emergeCommand - Debug" />
@@ -767,26 +759,6 @@
<Option target="emergeCore - Release" />
<Option target="emergeCore - Debug" />
</Unit>
- <Unit filename="emergeCore\emergeCore-w64.exe.manifest">
- <Option target="emergeLib - Release" />
- <Option target="emergeGraphics - Release" />
- <Option target="emergeAppletEngine - Release" />
- <Option target="emergeSchemeEngine - Release" />
- <Option target="emergeBaseClasses - Release" />
- <Option target="emergeCore - Release" />
- <Option target="emergeCommand - Release" />
- <Option target="emergeDesktop - Release" />
- <Option target="emergeHotkeys - Release" />
- <Option target="emergeLauncher - Release" />
- <Option target="emergeTasks - Release" />
- <Option target="emergeTray - Release" />
- <Option target="emergeVWM - Release" />
- <Option target="emerge - Release" />
- <Option target="emergeAppletEngine - Debug" />
- <Option target="emergeDesktop - Debug" />
- <Option target="emergeCore - Debug" />
- <Option target="emergeCommand - Debug" />
- </Unit>
<Unit filename="emergeCore\emergeCore.exe.manifest">
<Option target="emergeCore - Release" />
<Option target="emergeCore - Debug" />
@@ -884,26 +856,6 @@
<Option target="emergeDesktop - Release" />
<Option target="emergeDesktop - Debug" />
</Unit>
- <Unit filename="emergeDesktop\emergeDesktop-w64.exe.manifest">
- <Option target="emergeLib - Release" />
- <Option target="emergeGraphics - Release" />
- <Option target="emergeAppletEngine - Release" />
- <Option target="emergeSchemeEngine - Release" />
- <Option target="emergeBaseClasses - Release" />
- <Option target="emergeCore - Release" />
- <Option target="emergeCommand - Release" />
- <Option target="emergeDesktop - Release" />
- <Option target="emergeHotkeys - Release" />
- <Option target="emergeLauncher - Release" />
- <Option target="emergeTasks - Release" />
- <Option target="emergeTray - Release" />
- <Option target="emergeVWM - Release" />
- <Option target="emerge - Release" />
- <Option target="emergeAppletEngine - Debug" />
- <Option target="emergeDesktop - Debug" />
- <Option target="emergeCore - Debug" />
- <Option target="emergeCommand - Debug" />
- </Unit>
<Unit filename="emergeDesktop\emergeDesktop.exe.manifest">
<Option target="emergeDesktop - Release" />
<Option target="emergeDesktop - Debug" />
@@ -958,26 +910,6 @@
<Unit filename="emergeHotkeys\Settings.h">
<Option target="emergeHotkeys - Release" />
</Unit>
- <Unit filename="emergeHotkeys\emergeHotkeys-w64.exe.manifest">
- <Option target="emergeLib - Release" />
- <Option target="emergeGraphics - Release" />
- <Option target="emergeAppletEngine - Release" />
- <Option target="emergeSchemeEngine - Release" />
- <Option target="emergeBaseClasses - Release" />
- <Option target="emergeCore - Release" />
- <Option target="emergeCommand - Release" />
- <Option target="emergeDesktop - Release" />
- <Option target="emergeHotkeys - Release" />
- <Option target="emergeLauncher - Release" />
- <Option target="emergeTasks - Release" />
- <Option target="emergeTray - Release" />
- <Option target="emergeVWM - Release" />
- <Option target="emerge - Release" />
- <Option target="emergeAppletEngine - Debug" />
- <Option target="emergeDesktop - Debug" />
- <Option target="emergeCore - Debug" />
- <Option target="emergeCommand - Debug" />
- </Unit>
<Unit filename="emergeHotkeys\emergeHotkeys.exe.manifest">
<Option target="emergeHotkeys - Release" />
</Unit>
@@ -1015,26 +947,6 @@
<Unit filename="emergeLauncher\Settings.h">
<Option target="emergeLauncher - Release" />
</Unit>
- <Unit filename="emergeLauncher\emergeLauncher-w64.exe.manifest">
- <Option target="emergeLib - Release" />
- <Option target="emergeGraphics - Release" />
- <Option target="emergeAppletEngine - Release" />
- <Option target="emergeSchemeEngine - Release" />
- <Option target="emergeBaseClasses - Release" />
- <Option target="emergeCore - Release" />
- <Option target="emergeCommand - Release" />
- <Option target="emergeDesktop - Release" />
- <Option target="emergeHotkeys - Release" />
- <Option target="emergeLauncher - Release" />
- <Option target="emergeTasks - Release" />
- <Option target="emergeTray - Release" />
- <Option target="emergeVWM - Release" />
- <Option target="emerge - Release" />
- <Option target="emergeAppletEngine - Debug" />
- <Option target="emergeDesktop - Debug" />
- <Option target="emergeCore - Debug" />
- <Option target="emergeCommand - Debug" />
- </Unit>
<Unit filename="emergeLauncher\emergeLauncher.exe.manifest">
<Option target="emergeLauncher - Release" />
</Unit>
@@ -1060,26 +972,6 @@
<Unit filename="emergeLib\Shutdown.h">
<Option target="emergeLib - Release" />
</Unit>
- <Unit filename="emergeLib\emergeLib-w64.dll.manifest">
- <Option target="emergeLib - Release" />
- <Option target="emergeGraphics - Release" />
- <Option target="emergeAppletEngine - Release" />
- <Option target="emergeSchemeEngine - Release" />
- <Option target="emergeBaseClasses - Release" />
- <Option target="emergeCore - Release" />
- <Option target="emergeCommand - Release" />
- <Option target="emergeDesktop - Release" />
- <Option target="emergeHotkeys - Release" />
- <Option target="emergeLauncher - Release" />
- <Option target="emergeTasks - Release" />
- <Option target="emergeTray - Release" />
- <Option target="emergeVWM - Release" />
- <Option target="emerge - Release" />
- <Option target="emergeAppletEngine - Debug" />
- <Option target="emergeDesktop - Debug" />
- <Option target="emergeCore - Debug" />
- <Option target="emergeCommand - Debug" />
- </Unit>
<Unit filename="emergeLib\emergeLib.dll.manifest">
<Option target="emergeLib - Release" />
</Unit>
@@ -1154,9 +1046,6 @@
<Unit filename="emergePower\Settings.h">
<Option target="emergePower - Release" />
</Unit>
- <Unit filename="emergePower\emergePower-w64.exe.manifest">
- <Option target="emergePower - Release" />
- </Unit>
<Unit filename="emergePower\emergePower.exe.manifest">
<Option target="emergePower - Release" />
</Unit>
@@ -1213,9 +1102,6 @@
<Unit filename="emergeSysMon\Settings.h">
<Option target="emergeSysMon - Release" />
</Unit>
- <Unit filename="emergeSysMon\emergeSysMon-w64.exe.manifest">
- <Option target="emergeSysMon - Release" />
- </Unit>
<Unit filename="emergeSysMon\emergeSysMon.exe.manifest">
<Option target="emergeSysMon - Release" />
</Unit>
@@ -1241,6 +1127,15 @@
<Unit filename="emergeTasks\Config.h">
<Option target="emergeTasks - Release" />
</Unit>
+ <Unit filename="emergeTasks\ConfigPage.cpp">
+ <Option target="emergeTasks - Release" />
+ </Unit>
+ <Unit filename="emergeTasks\ConfigPage.dlg">
+ <Option target="emergeTasks - Release" />
+ </Unit>
+ <Unit filename="emergeTasks\ConfigPage.h">
+ <Option target="emergeTasks - Release" />
+ </Unit>
<Unit filename="emergeTasks\Settings.cpp">
<Option target="emergeTasks - Release" />
</Unit>
@@ -1253,26 +1148,6 @@
<Unit filename="emergeTasks\Task.h">
<Option target="emergeTasks - Release" />
</Unit>
- <Unit filename="emergeTasks\emergeTasks-w64.exe.manifest">
- <Option target="emergeLib - Release" />
- <Option target="emergeGraphics - Release" />
- <Option target="emergeAppletEngine - Release" />
- <Option target="emergeSchemeEngine - Release" />
- <Option target="emergeBaseClasses - Release" />
- <Option target="emergeCore - Release" />
- <Option target="emergeCommand - Release" />
- <Option target="emergeDesktop - Release" />
- <Option target="emergeHotkeys - Release" />
- <Option target="emergeLauncher - Release" />
- <Option target="emergeTasks - Release" />
- <Option target="emergeTray - Release" />
- <Option target="emergeVWM - Release" />
- <Option target="emerge - Release" />
- <Option target="emergeAppletEngine - Debug" />
- <Option target="emergeDesktop - Debug" />
- <Option target="emergeCore - Debug" />
- <Option target="emergeCommand - Debug" />
- </Unit>
<Unit filename="emergeTasks\emergeTasks.exe.manifest">
<Option target="emergeTasks - Release" />
</Unit>
@@ -1286,6 +1161,12 @@
<Unit filename="emergeTasks\resource.h">
<Option target="emergeTasks - Release" />
</Unit>
+ <Unit filename="emergeTray\AppBar.cpp">
+ <Option target="emergeTray - Release" />
+ </Unit>
+ <Unit filename="emergeTray\AppBar.h">
+ <Option target="emergeTray - Release" />
+ </Unit>
<Unit filename="emergeTray\Applet.cpp">
<Option target="emergeTray - Release" />
</Unit>
@@ -1310,26 +1191,6 @@
<Unit filename="emergeTray\TrayIcon.h">
<Option target="emergeTray - Release" />
</Unit>
- <Unit filename="emergeTray\emergeTray-w64.exe.manifest">
- <Option target="emergeLib - Release" />
- <Option target="emergeGraphics - Release" />
- <Option target="emergeAppletEngine - Release" />
- <Option target="emergeSchemeEngine - Release" />
- <Option target="emergeBaseClasses - Release" />
- <Option target="emergeCore - Release" />
- <Option target="emergeCommand - Release" />
- <Option target="emergeDesktop - Release" />
- <Option target="emergeHotkeys - Release" />
- <Option target="emergeLauncher - Release" />
- <Option target="emergeTasks - Release" />
- <Option target="emergeTray - Release" />
- <Option target="emergeVWM - Release" />
- <Option target="emerge - Release" />
- <Option target="emergeAppletEngine - Debug" />
- <Option target="emergeDesktop - Debug" />
- <Option target="emergeCore - Debug" />
- <Option target="emergeCommand - Debug" />
- </Unit>
<Unit filename="emergeTray\emergeTray.exe.manifest">
<Option target="emergeTray - Release" />
</Unit>
@@ -1367,26 +1228,6 @@
<Unit filename="emergeVWM\Task.h">
<Option target="emergeVWM - Release" />
</Unit>
- <Unit filename="emergeVWM\emergeVWM-w64.exe.manifest">
- <Option target="emergeLib - Release" />
- <Option target="emergeGraphics - Release" />
- <Option target="emergeAppletEngine - Release" />
- <Option target="emergeSchemeEngine - Release" />
- <Option target="emergeBaseClasses - Release" />
- <Option target="emergeCore - Release" />
- <Option target="emergeCommand - Release" />
- <Option target="emergeDesktop - Release" />
- <Option target="emergeHotkeys - Release" />
- <Option target="emergeLauncher - Release" />
- <Option target="emergeTasks - Release" />
- <Option target="emergeTray - Release" />
- <Option target="emergeVWM - Release" />
- <Option target="emerge - Release" />
- <Option target="emergeAppletEngine - Debug" />
- <Option target="emergeDesktop - Debug" />
- <Option target="emergeCore - Debug" />
- <Option target="emergeCommand - Debug" />
- </Unit>
<Unit filename="emergeVWM\emergeVWM.exe.manifest">
<Option target="emergeVWM - Release" />
</Unit>
@@ -1400,9 +1241,6 @@
<Unit filename="emergeVWM\resource.h">
<Option target="emergeVWM - Release" />
</Unit>
- <Unit filename="emerge\emerge-w64.exe.manifest">
- <Option target="emerge - Release" />
- </Unit>
<Unit filename="emerge\emerge.exe.manifest">
<Option target="emerge - Release" />
</Unit>
@@ -1413,6 +1251,85 @@
<Unit filename="emerge\main.cpp">
<Option target="emerge - Release" />
</Unit>
+ <Unit filename="reg2xml\AppletSettings.cpp">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\AppletSettings.h">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\CommandSettings.cpp">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\CommandSettings.h">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\CoreSettings.cpp">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\CoreSettings.h">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\DesktopSettings.cpp">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\DesktopSettings.h">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\HotkeysSettings.cpp">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\HotkeysSettings.h">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\Importer.cpp">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\Importer.h">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\LauncherSettings.cpp">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\LauncherSettings.h">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\Makefile">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\TasksSettings.cpp">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\TasksSettings.h">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\TraySettings.cpp">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\TraySettings.h">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\VWMSettings.cpp">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\VWMSettings.h">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\main.cpp">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\reg2xml.exe.manifest">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\reg2xml.project">
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\reg2xml.rc">
+ <Option compilerVar="WINDRES" />
+ <Option target="reg2xml - Release" />
+ </Unit>
+ <Unit filename="reg2xml\resource.h">
+ <Option target="reg2xml - Release" />
+ </Unit>
<Unit filename="svnversion.h" />
<Unit filename="tinyxml\tinystr.cpp">
<Option target="emergeLib - Release" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|