EpicSparrow/CMakeTemplate
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed resource error, changed folder naming policy

Browse Source
This commit is contained in:
Anselme 2016-05-31 23:47:33 +02:00
parent d9d5a648f6
commit d2917cb21a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resource/main.cpp
View File

@ -1,5 +1,6 @@
#include <cstdio> #include <cstdio>
#include <string> #include <string>
#include <vector>
using namespace std; using namespace std;
@ -59,9 +60,7 @@ int main(int argc, char *argv[])
packName = packName.substr(0, packName.find_first_of('.')); packName = packName.substr(0, packName.find_first_of('.'));
for(char c : packName) for(char c : packName)
{ {
if(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9') if(!(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9'))
; // OK
else
{ {
printf("error : \"%s\" is an invalid resource pack name, it must match this regex : [a-zA-Z0-9]+\n", packName.c_str()); printf("error : \"%s\" is an invalid resource pack name, it must match this regex : [a-zA-Z0-9]+\n", packName.c_str());
return EXIT_SUCCESS; return EXIT_SUCCESS;

5
template.cmake
View File

@ -104,7 +104,7 @@ if(USE_ENGINE)
# window and system are already requested by sparrowInput # window and system are already requested by sparrowInput
LIST(APPEND SFML_MODULES graphics audio) LIST(APPEND SFML_MODULES graphics audio)
LIST(APPEND INCLUDE_PATHS ${PROJECT_SOURCE_DIR}/../sparrowengine/src) LIST(APPEND INCLUDE_PATHS ${PROJECT_SOURCE_DIR}/../SparrowEngine/src)
LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_ENGINE_LIBRARY}) LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_ENGINE_LIBRARY})
endif() endif()
@ -118,7 +118,6 @@ if(USE_INPUT)
LIST(APPEND SFML_MODULES window system) LIST(APPEND SFML_MODULES window system)
LIST(APPEND INCLUDE_PATHS ${PROJECT_SOURCE_DIR}/../sparrowinput/src)
LIST(APPEND INCLUDE_PATHS ${PROJECT_SOURCE_DIR}/../SparrowInput/src) LIST(APPEND INCLUDE_PATHS ${PROJECT_SOURCE_DIR}/../SparrowInput/src)
LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_INPUT_LIBRARY}) LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_INPUT_LIBRARY})
endif() endif()
@ -353,7 +352,7 @@ if(USE_RENDERER)
set(USE_OPENGL True) set(USE_OPENGL True)
LIST(APPEND INCLUDE_PATHS ${PROJECT_SOURCE_DIR}/../sparrowrenderer/src) LIST(APPEND INCLUDE_PATHS ${PROJECT_SOURCE_DIR}/../SparrowRenderer/src)
LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_RENDERER_LIBRARY}) LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_RENDERER_LIBRARY})
endif() endif()