Преглед изворни кода

Fixing "release" builds
Fixing warnings
Fixing tools paths for non-standard build paths

BearishSun пре 9 година
родитељ
комит
996963f172

+ 1 - 1
Source/BansheeOpenAudio/Source/BsFLACDecoder.cpp

@@ -26,7 +26,7 @@ namespace BansheeEngine
 	{
 		FLACDecoderData* data = (FLACDecoderData*)(clientData);
 
-		data->stream->seek(data->streamOffset + absoluteByteOffset);
+		data->stream->seek(data->streamOffset + (UINT32)absoluteByteOffset);
 		INT64 position = (INT64)(data->stream->tell() - data->streamOffset);
 		if (position >= 0)
 			return FLAC__STREAM_DECODER_SEEK_STATUS_OK;

+ 1 - 1
Source/BansheeOpenAudio/Source/BsOggVorbisDecoder.cpp

@@ -28,7 +28,7 @@ namespace BansheeEngine
 			break;
 		}
 
-		decoderData->stream->seek(offset);
+		decoderData->stream->seek((UINT32)offset);
 		return (int)(decoderData->stream->tell() - decoderData->offset);
 	}
 

+ 6 - 6
Source/BansheeSL/CMakeLists.txt

@@ -19,12 +19,12 @@ target_compile_definitions(BansheeSL PRIVATE -DBS_SL_EXPORTS)
 # Pre-build step
 if(WIN32)
 add_custom_command(TARGET BansheeSL PRE_BUILD 
-	COMMAND ../../../Dependencies/tools/flex/flex.exe --wincompat ../../../Source/BansheeSL/BsLexerFX.l
-	COMMAND ../../../Dependencies/tools/bison/bison.exe ../../../Source/BansheeSL/BsParserFX.y
-	COMMAND xcopy /Y /I BsLexerFX.h \"../../../Source/BansheeSL/Include\"
-	COMMAND xcopy /Y /I BsLexerFX.c \"../../../Source/BansheeSL/Source\"
-	COMMAND xcopy /Y /I BsParserFX.h \"../../../Source/BansheeSL/Include\"
-	COMMAND xcopy /Y /I BsParserFX.c \"../../../Source/BansheeSL/Source\"
+	COMMAND ${PROJECT_SOURCE_DIR}/../Dependencies/tools/flex/flex.exe --wincompat ${PROJECT_SOURCE_DIR}/BansheeSL/BsLexerFX.l
+	COMMAND ${PROJECT_SOURCE_DIR}/../Dependencies/tools/bison/bison.exe ${PROJECT_SOURCE_DIR}/BansheeSL/BsParserFX.y
+	COMMAND xcopy /Y /I BsLexerFX.h \"${PROJECT_SOURCE_DIR}/BansheeSL/Include\"
+	COMMAND xcopy /Y /I BsLexerFX.c \"${PROJECT_SOURCE_DIR}/BansheeSL/Source\"
+	COMMAND xcopy /Y /I BsParserFX.h \"${PROJECT_SOURCE_DIR}/BansheeSL/Include\"
+	COMMAND xcopy /Y /I BsParserFX.c \"${PROJECT_SOURCE_DIR}/BansheeSL/Source\"
 	COMMAND del BsLexerFX.h BsLexerFX.c BsParserFX.h BsParserFX.c
 	COMMENT "Building lexer/parser..."
 )

+ 1 - 1
Source/BansheeSL/Include/BsLexerFX.h

@@ -349,7 +349,7 @@ extern int yylex \
 #undef YY_DECL
 #endif
 
-#line 395 "../../../Source/BansheeSL/BsLexerFX.l"
+#line 395 "C:/Projects/BansheeEngineDev/BansheeEngine/Source/BansheeSL/BsLexerFX.l"
 
 
 #line 356 "BsLexerFX.h"

+ 2 - 2
Source/BansheeSL/Include/BsParserFX.h

@@ -41,7 +41,7 @@ extern int yydebug;
 #endif
 /* "%code requires" blocks.  */
 /* Line 2579 of glr.c  */
-#line 9 "../../../Source/BansheeSL/BsParserFX.y"
+#line 9 "C:/Projects/BansheeEngineDev/BansheeEngine/Source/BansheeSL/BsParserFX.y"
 
 #include "BsMMAlloc.h"
 #include "BsASTFX.h"
@@ -230,7 +230,7 @@ typedef struct YYLTYPE {
 typedef union YYSTYPE
 {
 /* Line 2579 of glr.c  */
-#line 73 "../../../Source/BansheeSL/BsParserFX.y"
+#line 73 "C:/Projects/BansheeEngineDev/BansheeEngine/Source/BansheeSL/BsParserFX.y"
 
 	int intValue;
 	float floatValue;

Разлика између датотеке није приказан због своје велике величине
+ 176 - 176
Source/BansheeSL/Source/BsLexerFX.c


Разлика између датотеке није приказан због своје велике величине
+ 171 - 171
Source/BansheeSL/Source/BsParserFX.c


+ 3 - 3
Source/CMakeLists.txt

@@ -60,11 +60,11 @@ if(MSVC)
 	set(BS_LINKER_FLAGS_COMMON "/DYNAMICBASE /NOLOGO")
 
 	set(BS_LINKER_FLAGS_DEBUG "${BS_LINKER_FLAGS_COMMON} /DEBUG")
-	set(BS_LINKER_FLAGS_OPTIMIZEDDEBUG "${BS_LINKER_FLAGS_COMMON} /LTCG:incremental /OPT:REF /DEBUG")
+	set(BS_LINKER_FLAGS_OPTIMIZEDDEBUG "${BS_LINKER_FLAGS_COMMON} /LTCG:incremental /INCREMENTAL:NO /OPT:REF /DEBUG")
 	set(BS_LINKER_FLAGS_RELEASE "${BS_LINKER_FLAGS_COMMON} /LTCG /INCREMENTAL:NO /OPT:REF")
 	
 	if(BS_64BIT)
-		set(BS_LINKER_FLAGS_OPTIMIZEDDEBUG "${BS_LINKER_FLAGS_OPTIMIZEDDEBUG} /OPT:ICF /INCREMENTAL:NO")
+		set(BS_LINKER_FLAGS_OPTIMIZEDDEBUG "${BS_LINKER_FLAGS_OPTIMIZEDDEBUG} /OPT:ICF")
 		set(BS_LINKER_FLAGS_RELEASE "${BS_LINKER_FLAGS_RELEASE} /OPT:ICF")
 	endif()
 	
@@ -93,7 +93,7 @@ if(MSVC)
 	endif()
 	
 	set(CMAKE_CXX_FLAGS_OPTIMIZEDDEBUG "${BS_COMPILER_FLAGS_COMMON} /GL /Gy /Zi /Gm /O2 /Oi /MD")
-	set(CMAKE_CXX_FLAGS_RELEASE "${BS_COMPILER_FLAGS_COMMON} /GL /Gy /O2 /Oi /MD /MP")
+	set(CMAKE_CXX_FLAGS_RELEASE "${BS_COMPILER_FLAGS_COMMON} /GL /Gy /O2 /Oi /MD")
 	
 	# Global defines
 	add_definitions(-D_HAS_EXCEPTIONS=0)

Неке датотеке нису приказане због велике количине промена