Changed CFLAGS and minor fixes

Northfear · Apr 14, 2021 · 42e5a43 · 42e5a43
1 parent b055076
commit 42e5a43
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -115,7 +115,7 @@ endif()
 
 if(VITA)
     add_definitions(-DVITA)
-    set(VITA_FLAGS "-Ofast -mcpu=cortex-a9 -mfpu=neon -fgraphite-identity -floop-nest-optimize -fno-lto -Wl,--whole-archive -lpthread -Wl,--no-whole-archive")
+    set(VITA_FLAGS "-O2 -mcpu=cortex-a9 -mfpu=neon -ffast-math -ftree-vectorize -fno-lto -Wl,--whole-archive -lpthread -Wl,--no-whole-archive")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VITA_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VITA_FLAGS}")
     list(APPEND VANILLA_LIBS "-lSceMotion_stub -lSceTouch_stub -lSceAudio_stub -lSceAudioIn_stub  -lSceCtrl_stub -lSceGxm_stub \

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Check Vanilla Conquer Wiki for more info about required folder/file structure an
 ### Build
 ```
 mkdir build && cd build
-cmake .. -DCMAKE_TOOLCHAIN_FILE=$VITASDK/share/vita.toolchain.cmake -DVITA=true -DCMAKE_BUILD_TYPE=Release
+cmake .. -DCMAKE_TOOLCHAIN_FILE=$VITASDK/share/vita.toolchain.cmake -DVITA=true -DCMAKE_BUILD_TYPE=None
 make
 ```
 

diff --git a/common/paths.cpp b/common/paths.cpp
@@ -41,14 +41,15 @@ void PathsClass::Init(const char* suffix, const char* ini_name, const char* data
     Program_Path();
     Data_Path();
     User_Path();
-
+    //crashes on Vita after DBG_INFO in DEBUG build for some reason
+#ifndef VITA
     DBG_INFO("Searching the following paths for path config data:\n  argv: '%s'\n  binary: '%s'\n  default data: "
              "'%s'\n  default user: '%s'",
              argv_path.c_str(),
              ProgramPath.c_str(),
              DataPath.c_str(),
              UserPath.c_str());
-
+#endif
     // Check for a config file to load paths from.
     RawFileClass file;
     bool use_argv_path = false;

diff --git a/redalert/scroll.cpp b/redalert/scroll.cpp
@@ -104,6 +104,8 @@ void ScrollClass::AI(KeyNumType& input, int x, int y)
             int scrollDistance = (7 - Options.ScrollRate) * 20;
             Scroll_Map((DirType)scrollDirection, scrollDistance, true);
         }
+        // scroll only with analog sticks for now
+        noscroll = true;
 #endif
 
         if (!noscroll) {

diff --git a/tiberiandawn/scroll.cpp b/tiberiandawn/scroll.cpp
@@ -108,6 +108,8 @@ void ScrollClass::AI(KeyNumType& input, int x, int y)
             int scrollDistance = (7 - Options.ScrollRate) * 20;
             Scroll_Map((DirType)scrollDirection, scrollDistance, true);
         }
+        // scroll only with analog sticks for now
+        noscroll = true;
 #endif
 
         if (!noscroll) {