Browse Source

Part of SampleFileList was not auto generated, now it is.

It took me a while to figure out why the samples were not compiling.
Nate Starkey 13 years ago
parent
commit
b4fecce9e5

+ 26 - 0
Build/cmake/SampleFileList.cmake

@@ -204,3 +204,29 @@ set(shell_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Samples/shell/src/ShellSystemInterface.cpp
 )
 
+# Deal with platform specific sources for sample shell
+if(WIN32)
+	list(APPEND shell_SRC_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/win32/ShellWin32.cpp
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/win32/InputWin32.cpp
+	)
+	list(APPEND shell_HDR_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/include/win32/InputWin32.h
+	)
+elseif(APPLE)
+	list(APPEND shell_SRC_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/macosx/ShellMacOSX.cpp
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/macosx/InputMacOSX.cpp
+	)
+	list(APPEND shell_HDR_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/include/macosx/InputMacOSX.h
+	)
+else()
+	list(APPEND shell_SRC_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/x11/ShellX11.cpp
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/x11/InputX11.cpp
+	)
+	list(APPEND shell_HDR_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/include/x11/InputX11.h
+	)
+endif()

+ 26 - 0
Build/cmake/gen_sample_plat_specific.txt

@@ -0,0 +1,26 @@
+# Deal with platform specific sources for sample shell
+if(WIN32)
+	list(APPEND shell_SRC_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/win32/ShellWin32.cpp
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/win32/InputWin32.cpp
+	)
+	list(APPEND shell_HDR_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/include/win32/InputWin32.h
+	)
+elseif(APPLE)
+	list(APPEND shell_SRC_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/macosx/ShellMacOSX.cpp
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/macosx/InputMacOSX.cpp
+	)
+	list(APPEND shell_HDR_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/include/macosx/InputMacOSX.h
+	)
+else()
+	list(APPEND shell_SRC_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/x11/ShellX11.cpp
+		${PROJECT_SOURCE_DIR}/Samples/shell/src/x11/InputX11.cpp
+	)
+	list(APPEND shell_HDR_FILES
+		${PROJECT_SOURCE_DIR}/Samples/shell/include/x11/InputX11.h
+	)
+endif()

+ 2 - 0
Build/cmake/gen_samplelists.sh

@@ -2,6 +2,7 @@
 
 basedir="../.."
 file=Build/cmake/SampleFileList.cmake
+platspecific=Build/cmake/gen_sample_plat_specific.txt
 src='set(sample_SRC_FILES'
 hdr='set(sample_HDR_FILES'
 srcdir='${PROJECT_SOURCE_DIR}'
@@ -28,5 +29,6 @@ echo -e "# This file was auto-generated with gen_samplelists.sh\n" >$file
 for sample in ${samples[@]}; do
     printfiles $sample
 done
+cat $platspecific >> $file
 popd