Merge branch 'master' of https://github.com/alariq/mc2

alariq · Nov 22, 2017 · cc2c435 · cc2c435
2 parents 3cfd828 + fa81733
commit cc2c435
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/GameOS/gameos/gameosmain.cpp b/GameOS/gameos/gameosmain.cpp
@@ -166,6 +166,7 @@ static void draw_screen( void )
 
 extern float frameRate;
 
+#ifndef DISABLE_GAMEOS_MAIN
 int main(int argc, char** argv)
 {
     //signal(SIGTRAP, SIG_IGN);
@@ -297,4 +298,4 @@ int main(int argc, char** argv)
 
     return 0;
 }
-
+#endif // DISABLE_GAMEOS_MAIN
diff --git a/GameOS/gameos/gos_render.cpp b/GameOS/gameos/gos_render.cpp
@@ -98,8 +98,9 @@ RenderWindow* create_window(const char* pwinname, int width, int height)
     SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
 
     // 4x multisampling :P
-    SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
-    SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4);
+    // disable, and add as setting later.
+    //SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
+    //SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4);
 
 
     // select core profile if needed

diff --git a/data_tools/CMakeLists.txt b/data_tools/CMakeLists.txt
@@ -10,13 +10,14 @@ endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -std=c++0x -ggdb ")
 if(NOT MSVC)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs -Wno-unknown-warning-option")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs -Wno-unknown-warning-option") #-fsanitize=address -fno-omit-frame-pointer")
 endif()
 
 add_definitions(-D_ARMOR)
 add_definitions(-D_DEBUG)
 add_definitions(-DUSE_ASSEMBLER_CODE=0)
 add_definitions(-DLINUX_BUILD)
+add_definitions(-DDISABLE_GAMEOS_MAIN)
 
 if(MSVC)
 	add_definitions(-DPLATFORM_WINDOWS)
@@ -71,6 +72,8 @@ if(WIN32)
 	set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${OPENGL_gl_LIBRARY} )
 	message("OpenGL library linking: ${OPENGL_gl_LIBRARY}")
 	message("OpenGL library include: ${OPENGL_INCLUDE_DIR}")
+else()
+	set(ADDITIONAL_LIBS dl) # needed by gameos linked by aseconv
 endif()
 
 add_executable(makefst ${MAKEFST_SOURCES})

diff --git a/data_tools/aseconv.cpp b/data_tools/aseconv.cpp
@@ -141,20 +141,20 @@ void ParseCommandLine(char *command_line)
 	i = 0;
 	while (i<n_args)
 	{
-		if (strcmpi(argv[i], "-file") == 0)	{
+		if (S_stricmp(argv[i], "-file") == 0)	{
 			i = parseParam(i, n_args, argv, fileName);
 		}
-		if (strcmpi(argv[i], "-list") == 0) {
+		if (S_stricmp(argv[i], "-list") == 0) {
 			i = parseParam(i, n_args, argv, listName);
 		}
-		if (strcmpi(argv[i], "-prefix-path") == 0) {
+		if (S_stricmp(argv[i], "-prefix-path") == 0) {
 			i = parseParam(i, n_args, argv, prefixPath);
 		}
-		if (strcmpi(argv[i], "-dst-path") == 0)	{
+		if (S_stricmp(argv[i], "-dst-path") == 0)	{
 			i = parseParam(i, n_args, argv, dstPath);
 		}
 
-		if (strcmpi(argv[i], "-arm") == 0)
+		if (S_stricmp(argv[i], "-arm") == 0)
 		{
 			createARM = true;
 		}
@@ -622,7 +622,7 @@ int main(int argc, char** argv)
 	create_path(dstPath);
 
 	// Initialize COM and create an instance of the InterfaceImplementation class:
-	CoInitialize(NULL);
+	//CoInitialize(NULL);
 	armProvider = CreateProviderEngine("AseConv", versionStamp);
 
 	assert(armProvider);
@@ -676,7 +676,7 @@ int main(int argc, char** argv)
 	//
 	// Exit app
 	//
-	CoUninitialize();
+	//CoUninitialize();
 
 	//ExitGameOS();	
 

diff --git a/data_tools/makersp.cpp b/data_tools/makersp.cpp
@@ -21,7 +21,6 @@ int gen_rsp(const char* prefix_path, std::queue<const char*>& wildcards, const c
     if(!prefix_path || !rsp_file)
         return -1;
 
-    std::queue<char*> files2pack;
     size_t num_files2pack = 0;
 
 	size_t prefix_path_len = strlen(prefix_path);
@@ -67,13 +66,16 @@ int gen_rsp(const char* prefix_path, std::queue<const char*>& wildcards, const c
 			{
 				if ((findResult.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
 				{
-					char* filename = new char[strlen(findResult.cFileName) + strlen(wildcard_dir) +  1];
+                    // +1 for \n
+					char* filename = new char[strlen(findResult.cFileName) + strlen(wildcard_dir) + 1 + 1];
 					sprintf(filename, "%s%s\n", wildcard_dir, findResult.cFileName);
-					files2pack.push(filename);
 					SPEW(("\t", "%s\n", filename));
 					num_files2pack++;
 
 					fwrite(filename, strlen(filename), 1, fh);
+
+                    // TODO: reuse buffer for filenames
+                    delete[] filename;
 				}
 			} while (FindNextFile(searchHandle, &findResult) != 0);
 
@@ -85,6 +87,7 @@ int gen_rsp(const char* prefix_path, std::queue<const char*>& wildcards, const c
 
 	fclose(fh);
 
+    delete[] prefix;
 
     return 0;
 }