Post Reply 
Free42 state file switching, export, and import
08-18-2019, 04:29 PM (This post was last modified: 08-18-2019 04:31 PM by Thomas Okken.)
Post: #14
RE: Free42 state file switching, export, and import
OK, I made those changes to gtk/Makefile, and fixed the indentation warnings in core_display.cc and core_keydown.cc.

Code:
/Users/thomas/xcode/free42/gtk $ svn diff -r 2932 -x -w
Index: Makefile
===================================================================
--- Makefile    (revision 2932)
+++ Makefile    (working copy)
@@ -20,6 +20,11 @@
      -Wno-parentheses \
      -Wno-write-strings \
      -Wno-sign-compare \
+     -Wno-narrowing \
+     -Wno-constant-conversion \
+     -Wno-sometimes-uninitialized \
+     -Wno-format-truncation \
+     -Wno-unknown-warning-option \
      -g \
      -I/usr/X11R6/include \
      $(shell pkg-config --cflags gtk+-2.0) \
@@ -36,26 +41,14 @@
      -D_WCHAR_T_DEFINED
 
 LDFLAGS = -L/usr/X11R6/lib
-LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-2.0) -lXmu
+LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-2.0) -lXmu -lX11
 
-ifeq "$(shell uname -s)" "Linux"
-LDFLAGS += -Wl,--hash-style=both
-LIBS += -lpthread
-endif
-
 ifeq "$(shell uname -s)" "FreeBSD"
-CFLAGS += -Wno-narrowing -Wno-constant-conversion -Wno-sometimes-uninitialized
-LIBS += -lX11
 ifdef AUDIO_ALSA
 LIBS += -ldl
 endif
 endif
 
-ifeq "$(shell uname -s)" "SunOS"
-CFLAGS += -Wno-narrowing -Wno-misleading-indentation
-LIBS += -lX11
-endif
-
 ifneq "$(findstring 6162,$(shell echo ab | od -x))" ""
 CFLAGS += -DF42_BIG_ENDIAN -DBID_BIG_ENDIAN
 endif
/Users/thomas/xcode/free42/gtk $

I also had to add -Wno-unknown-warning-option, because clang does still complain about unknown -Wno-foo options. But at least you can tell it not to!

And I removed the -Wl,--hash-style=both from the Linux build. That was a holdover from when I was still using Fedora 6, and I doubt anyone still needs that.

I'll post an updated tarball shortly. No sense in waiting for the new Android build; it is hot and humid here today, and I have no energy, so while I may tinker with the state file management window for Android a bit, there is no way that work is getting completed this weekend.
Visit this user's website Find all posts by this user
Quote this message in a reply
Post Reply 


Messages In This Thread
RE: Free42 state file switching, export, and import - Thomas Okken - 08-18-2019 04:29 PM



User(s) browsing this thread: 1 Guest(s)