Switched over to cmake. Everything now works in one command.

This commit is contained in:
Fatbag 2012-01-28 12:11:34 -06:00
parent b3985e7306
commit 17c3bb1145
20 changed files with 179 additions and 203 deletions

1
Tools/CMakeLists.txt Normal file
View file

@ -0,0 +1 @@
add_subdirectory(FARDive)

View file

@ -0,0 +1,19 @@
cmake_minimum_required(VERSION 2.6)
project(FARDive)
if(WIN32)
set(FARDIVE_SOURCES
windows/common.cpp
windows/Interaction.cpp
windows/MainWindow.cpp
windows/ReadPNGIcon.cpp
windows/Resource.rc
windows/Startup.cpp
windows/Dialog/AddToArchive.cpp
windows/Dialog/NewArchive.cpp
)
set(FARDIVE_LINK -mwindows ole32 uxtheme)
endif()
add_executable(FARDive ${FARDIVE_SOURCES})
target_link_libraries(FARDive ${FARDIVE_LINK} libpng_shared)

View file

@ -1,5 +1,5 @@
#include <windows.h>
#include "../libpng-1.5.6/png.h"
#include "../../../Libraries/FileHandler/libpng/png.h"
extern HDC hDC;

View file

@ -1,6 +1,6 @@
#include "Windows.hpp"
#include "GUI.hpp"
#include "../libpng-1.5.6/png.h"
#include "../../../Libraries/FileHandler/libpng/png.h"
HBITMAP PNGIcon[MENUICONS];

View file

@ -3,8 +3,8 @@
#include "../version.hpp"
#include "resource.hpp"
ID_MANIFEST RT_MANIFEST "resources/Windows/FARDive.exe.manifest"
IDI_FARDIVE ICON "resources/Windows/FARDive.ico"
ID_MANIFEST RT_MANIFEST "../resources/Windows/FARDive.exe.manifest"
IDI_FARDIVE ICON "../resources/Windows/FARDive.ico"
ID_VERSIONINFO VERSIONINFO
FILEVERSION FD_VERSION_A,FD_VERSION_B,FD_VERSION_C,FD_REVISION
@ -82,34 +82,34 @@ BEGIN
END
END
IDI_FILE_NEW RCDATA "resources/icons/document-new.png"
IDI_FILE_OPEN RCDATA "resources/icons/document-open.png"
IDI_FILE_SAVE RCDATA "resources/icons/document-save.png"
IDI_FILE_SAVEAS RCDATA "resources/icons/document-save-as.png"
IDI_FILE_ADD RCDATA "resources/icons/list-add.png"
IDI_FILE_EXPORTALL RCDATA "resources/icons/package-x-generic.png"
IDI_FILE_EXPORTSELECTED RCDATA "resources/icons/package-x-generic-selected.png"
IDI_FILE_CHANGETYPE RCDATA "resources/icons/applications-other.png"
IDI_FILE_CLOSE RCDATA "resources/icons/emblem-unreadable.png"
IDI_FILE_EXIT RCDATA "resources/icons/system-log-out.png"
IDI_EDIT_DUPLICATE RCDATA "resources/icons/edit-copy.png"
IDI_EDIT_REMOVE RCDATA "resources/icons/list-remove.png"
IDI_EDIT_RENAME RCDATA "resources/icons/edit-select-all.png"
IDI_EDIT_PROPERTIES RCDATA "resources/icons/document-properties.png"
IDI_EDIT_CONTENTS RCDATA "resources/icons/accessories-text-editor.png"
IDI_EDIT_FIND RCDATA "resources/icons/edit-find.png"
IDI_EDIT_FINDNEXT RCDATA "resources/icons/go-last.png"
IDI_EDIT_FINDPREVIOUS RCDATA "resources/icons/go-first.png"
IDI_EDIT_MATCHES RCDATA "resources/icons/preferences-system-windows.png"
IDI_EDIT_GOTO RCDATA "resources/icons/go-jump.png"
IDI_EDIT_PREFERENCES RCDATA "resources/icons/preferences-desktop.png"
IDI_TOOLS_RECOMPRESS RCDATA "resources/icons/system-file-manager.png"
IDI_TOOLS_RESORT RCDATA "resources/icons/mail-send-receive.png"
IDI_TOOLS_REMOVEHOLES RCDATA "resources/icons/edit-clear.png"
IDI_TOOLS_BATCH RCDATA "resources/icons/utilities-terminal.png"
IDI_HELP_WEBSITE RCDATA "resources/icons/internet-web-browser.png"
IDI_FILE_NEW RCDATA "../resources/icons/document-new.png"
IDI_FILE_OPEN RCDATA "../resources/icons/document-open.png"
IDI_FILE_SAVE RCDATA "../resources/icons/document-save.png"
IDI_FILE_SAVEAS RCDATA "../resources/icons/document-save-as.png"
IDI_FILE_ADD RCDATA "../resources/icons/list-add.png"
IDI_FILE_EXPORTALL RCDATA "../resources/icons/package-x-generic.png"
IDI_FILE_EXPORTSELECTED RCDATA "../resources/icons/package-x-generic-selected.png"
IDI_FILE_CHANGETYPE RCDATA "../resources/icons/applications-other.png"
IDI_FILE_CLOSE RCDATA "../resources/icons/emblem-unreadable.png"
IDI_FILE_EXIT RCDATA "../resources/icons/system-log-out.png"
IDI_EDIT_DUPLICATE RCDATA "../resources/icons/edit-copy.png"
IDI_EDIT_REMOVE RCDATA "../resources/icons/list-remove.png"
IDI_EDIT_RENAME RCDATA "../resources/icons/edit-select-all.png"
IDI_EDIT_PROPERTIES RCDATA "../resources/icons/document-properties.png"
IDI_EDIT_CONTENTS RCDATA "../resources/icons/accessories-text-editor.png"
IDI_EDIT_FIND RCDATA "../resources/icons/edit-find.png"
IDI_EDIT_FINDNEXT RCDATA "../resources/icons/go-last.png"
IDI_EDIT_FINDPREVIOUS RCDATA "../resources/icons/go-first.png"
IDI_EDIT_MATCHES RCDATA "../resources/icons/preferences-system-windows.png"
IDI_EDIT_GOTO RCDATA "../resources/icons/go-jump.png"
IDI_EDIT_PREFERENCES RCDATA "../resources/icons/preferences-desktop.png"
IDI_TOOLS_RECOMPRESS RCDATA "../resources/icons/system-file-manager.png"
IDI_TOOLS_RESORT RCDATA "../resources/icons/mail-send-receive.png"
IDI_TOOLS_REMOVEHOLES RCDATA "../resources/icons/edit-clear.png"
IDI_TOOLS_BATCH RCDATA "../resources/icons/utilities-terminal.png"
IDI_HELP_WEBSITE RCDATA "../resources/icons/internet-web-browser.png"
IDB_INFO BITMAP "resources/icons/info.bmp"
IDB_INFO BITMAP "../resources/icons/info.bmp"
ID_ACCELERATOR ACCELERATORS
BEGIN