Fixed cmake to use find the proper xpm file in the xrc folder, also made the vbam core and fex library static to help with building on some platforms.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1416 a31d4220-a93d-0410-bf67-fe4944624d44
2015-05-10 22:54:19 +00:00 · 2015-05-10 22:54:19 +00:00 · 95a976aa77
parent 8e9e59ea03
commit 95a976aa77
4 changed files with 4 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -313,6 +313,7 @@ ENDIF( ENABLE_FFMPEG )

 ADD_LIBRARY (
    vbamcore
+    STATIC
    ${PROJECT_SRCS}
    ${SRC_MAIN}
    ${SRC_GBA}
--- a/fex/CMakeLists.txt
+++ b/fex/CMakeLists.txt
@ -38,5 +38,6 @@ INCLUDE_DIRECTORIES(

 ADD_LIBRARY(
    fex
+    STATIC
    ${SRC_FEX}
 )
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@ -124,7 +124,7 @@ SET( SRC_WX
   cmdhandlers.h
   cmd-evtable.h
   #Icon File
-   wxvbam.xpm
+   xrc/wxvbam.xpm
 )

 IF(ENABLE_OPENAL)
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@ -28,7 +28,7 @@
 // ImageMagick makes the name wxvbam, but wx expects wxvbam_xpm
 #define wxvbam wxvbam_xpm
 const
-#include "wxvbam.xpm"
+#include "xrx/wxvbam.xpm"
 #undef wxvbam
 #endif