compile fix

goblinhack · Jan 25, 2024 · 637dbd2 · 637dbd2
1 parent 32a990b
commit 637dbd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/build/build.sh b/build/build.sh
@@ -289,9 +289,7 @@ case "$MY_OS_NAME" in
         LDLIBS+=" -L/${MINGW_TYPE}/glib/"
         LDLIBS=$(echo $LDLIBS | sed -e 's/-lmingw32 //g')
         LDLIBS+=" -funwind-tables"
-        LDLIBS+=" -static-libstdc++"
-        LDLIBS+=" -static-libgcc"
-        LDLIBS+=" -Wl,-Bstatic -Wl,-Bdynamic"
+        LDLIBS+=" -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic"
         LDLIBS+=" -lopengl32"
         LDLIBS+=" -lpthread"
         LDLIBS+=" /${MINGW_TYPE}/lib/libSDL2_mixer.a"
@@ -437,7 +435,7 @@ case "$MY_OS_NAME" in
         #
         # To resolve WinMain, add these at the end again
         #
-        LDLIBS="$LDLIBS -lmingw32 -lSDL2main -lSDL2 -mwindows /${MINGW_TYPE}/lib/libSDL2main.a -L/${MINGW_TYPE}/lib -lSDL2main -lSDL2"
+        LDLIBS="$LDLIBS -lmingw32 -mwindows /${MINGW_TYPE}/lib/libSDL2main.a -L/${MINGW_TYPE}/lib -lSDL2main -lSDL2"
     ;;
 esac
 

diff --git a/src/core/command.cpp b/src/core/command.cpp
@@ -78,7 +78,6 @@
 
 class command_t
 {
-
 public:
   command_t(void)
   {
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,6 @@ @@
     class command_t
     {
     public:
       command_t(void)
       {
@@ Expand Down @@