Skip to content

Commit

Permalink
Fix CMakelists Arch variable
Browse files Browse the repository at this point in the history
  • Loading branch information
@TricksterGuy
TricksterGuy committed Mar 11, 2015
1 parent 3662d06 commit cfd8cab
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 49 deletions.
6 changes: 4 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cmake_minimum_required (VERSION 2.6)
project (nin10kit)

EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE )

set(CPACK_BINARY_DEB "ON")
set(CPACK_BINARY_RPM "ON")
set(CPACK_BINARY_TGZ "ON")
Expand All @@ -24,8 +26,8 @@ set(CPACK_DEBIAN_PACKAGE_DEPENDS "")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Brandon Whitehead <[email protected]>")
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ".")

set(CPACK_PACKAGE_FILE_NAME "nin10kit-1.0.0")
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCH})
set(CPACK_PACKAGE_FILE_NAME "nin10kit-1.0.0-${ARCHITECTURE}")
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCHITECTURE})

include(CPack)
include(FindPkgConfig)
Expand Down
112 changes: 65 additions & 47 deletions nin10kit.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,53 +28,53 @@
<Add directory="D:/src/wxWidgets-3.0.2-MSW/lib/mswu" />
</Compiler>
<Linker>
<Add library="D:\src\ImageMagick-6.8.5\lib\libMagick++-6.Q16.dll.a" />
<Add library="D:\src\ImageMagick-6.8.5\lib\libMagickCore-6.Q16.dll.a" />
<Add library="D:\src\ImageMagick-6.8.5\lib\libMagickWand-6.Q16.dll.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxbase30u.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxbase30u_net.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxbase30u_xml.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxbase30ud.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxbase30ud_net.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxbase30ud_xml.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxexpat.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxexpatd.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxjpeg.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxjpegd.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_adv.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_aui.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_core.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_gl.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_html.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_media.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_propgrid.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_ribbon.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_richtext.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_stc.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_webview.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30u_xrc.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_adv.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_aui.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_core.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_gl.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_html.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_media.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_propgrid.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_ribbon.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_richtext.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_stc.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_webview.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxmsw30ud_xrc.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxpng.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxpngd.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxregexu.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxregexud.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxscintilla.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxscintillad.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxtiff.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxtiffd.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxzlib.a" />
<Add library="D:\src\wxWidgets-3.0.2-MSW\lib\libwxzlibd.a" />
<Add library="D:/src/ImageMagick-6.8.5/lib/libMagick++-6.Q16.dll.a" />
<Add library="D:/src/ImageMagick-6.8.5/lib/libMagickCore-6.Q16.dll.a" />
<Add library="D:/src/ImageMagick-6.8.5/lib/libMagickWand-6.Q16.dll.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxbase30u.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxbase30u_net.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxbase30u_xml.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxbase30ud.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxbase30ud_net.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxbase30ud_xml.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxexpat.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxexpatd.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxjpeg.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxjpegd.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_adv.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_aui.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_core.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_gl.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_html.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_media.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_propgrid.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_ribbon.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_richtext.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_stc.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_webview.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30u_xrc.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_adv.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_aui.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_core.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_gl.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_html.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_media.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_propgrid.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_ribbon.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_richtext.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_stc.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_webview.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxmsw30ud_xrc.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxpng.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxpngd.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxregexu.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxregexud.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxscintilla.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxscintillad.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxtiff.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxtiffd.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxzlib.a" />
<Add library="D:/src/wxWidgets-3.0.2-MSW/lib/libwxzlibd.a" />
<Add directory="D:/src/ImageMagick-6.8.5/lib" />
<Add directory="D:/src/wxWidgets-3.0.2-MSW/lib" />
</Linker>
Expand Down Expand Up @@ -114,6 +114,24 @@
<Unit filename="gui/nin10kitgui.h">
<Option target="nin10kitgui" />
</Unit>
<Unit filename="gui/nin10kitviewer.cpp">
<Option target="nin10kitgui" />
</Unit>
<Unit filename="gui/nin10kitviewer.hpp">
<Option target="nin10kitgui" />
</Unit>
<Unit filename="gui/nin10kitviewergui.cpp">
<Option target="nin10kitgui" />
</Unit>
<Unit filename="gui/nin10kitviewergui.h">
<Option target="nin10kitgui" />
</Unit>
<Unit filename="gui/wxlogger.cpp">
<Option target="nin10kitgui" />
</Unit>
<Unit filename="gui/wxlogger.hpp">
<Option target="nin10kitgui" />
</Unit>
<Unit filename="shared/3ds-exporter.cpp" />
<Unit filename="shared/alltypes.hpp" />
<Unit filename="shared/cmd-line-parser-helper.cpp" />
Expand Down

0 comments on commit cfd8cab

Please sign in to comment.