ソースを参照

Fixed UI module cmake and added it to the standalone install and global gitignore

Ivan Safrin 13 年 前
コミット
424803c1f3
3 ファイル変更12 行追加1 行削除
  1. 5 0
      .gitignore
  2. 3 1
      Modules/Bindings/UI/CMakeLists.txt
  3. 4 0
      Standalone/CMakeLists.txt

+ 5 - 0
.gitignore

@@ -57,6 +57,11 @@ Player/Build/Mac OS X/Polycode Player.xcodeproj/project.xcworkspace/xcuserdata/i
 /Modules/Bindings/3DPhysics/Include/*.h
 /Modules/Bindings/3DPhysics/Source/*.cpp
 
+/Modules/Bindings/UI/API/UI/*.lua
+/Modules/Bindings/UI/API/UI.lua
+/Modules/Bindings/UI/Include/*.h
+/Modules/Bindings/UI/Source/*.cpp
+
 /Player/Build
 /Standalone/Build
 

+ 3 - 1
Modules/Bindings/UI/CMakeLists.txt

@@ -28,6 +28,7 @@ SET(polycodeUI_SRCS
     ../../Contents/UI/Source/PolyUIVScrollBar.cpp
     ../../Contents/UI/Source/PolyUIVSizer.cpp
     ../../Contents/UI/Source/PolyUIWindow.cpp
+    ../../Contents/UI/Source/PolyUIMenu.cpp
 )
 
 SET(polycodeUI_HDRS
@@ -52,6 +53,7 @@ SET(polycodeUI_HDRS
     ../../Contents/UI/Include/PolyUIVScrollBar.h
     ../../Contents/UI/Include/PolyUIVSizer.h
     ../../Contents/UI/Include/PolyUIWindow.h
+    ../../Contents/UI/Include/PolyUIMenu.h
     ../../Contents/UI/Include/PolycodeUI.h
 )
 
@@ -138,4 +140,4 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
          DESTINATION Bindings/Lua/Modules/UI/lib)
 #    ENDIF(POLYCODE_BUILD_STATIC)
     
-ENDIF(POLYCODE_INSTALL_FRAMEWORK)
+ENDIF(POLYCODE_INSTALL_FRAMEWORK)

+ 4 - 0
Standalone/CMakeLists.txt

@@ -10,6 +10,7 @@ INSTALL(FILES ../LICENSE.txt
 
 INSTALL(DIRECTORY ${PolycodeStandalone_SOURCE_DIR}/../Modules/Bindings/2DPhysics/API DESTINATION Modules/Physics2D)
 INSTALL(DIRECTORY ${PolycodeStandalone_SOURCE_DIR}/../Modules/Bindings/3DPhysics/API DESTINATION Modules/Physics3D)
+INSTALL(DIRECTORY ${PolycodeStandalone_SOURCE_DIR}/../Modules/Bindings/UI/API DESTINATION Modules/UI)
 
 INSTALL(DIRECTORY ${PolycodeStandalone_SOURCE_DIR}/../Examples/Lua DESTINATION Examples)
 
@@ -31,6 +32,7 @@ IF(MSVC OR MINGW)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/main.polyapp DESTINATION Publish/Win)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/2DPhysics/lib/Physics2D.dll DESTINATION Modules/Physics2D/Lib/win)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/3DPhysics/lib/Physics3D.dll DESTINATION Modules/Physics3D/Lib/win)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/UI/lib/UI.dll DESTINATION Modules/UI/Lib/win)
 
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polybuild.exe DESTINATION Bin)
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polyimport.exe DESTINATION Bin)
@@ -43,6 +45,7 @@ ELSEIF(APPLE)
 	INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Player/StandalonePlayer.app DESTINATION Publish/Mac USE_SOURCE_PERMISSIONS)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/2DPhysics/lib/Physics2D.dylib DESTINATION Modules/Physics2D/Lib/osx)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/3DPhysics/lib/Physics3D.dylib DESTINATION Modules/Physics3D/Lib/osx)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/UI/lib/UI.dylib DESTINATION Modules/UI/Lib/osx)
 
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polybuild DESTINATION Bin)
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polyimport DESTINATION Bin)
@@ -61,6 +64,7 @@ ELSE(MSVC OR MINGW)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/main.polyapp DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/2DPhysics/lib/Physics2D.so DESTINATION Modules/Physics2D/Lib/linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/3DPhysics/lib/Physics3D.so DESTINATION Modules/Physics3D/Lib/linux)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/UI/lib/UI.so DESTINATION Modules/UI/Lib/linux)
 
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polybuild DESTINATION Bin)
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polyimport DESTINATION Bin)